Manually cherry-picked at https://github.com/rubygems/rubygems/commit/80260b3496e357bf96ffe6f381e29bf25b6749cb

5 files changed, 89 insertions, 2 deletions

diff --git a/lib/bundler/cli.rb b/lib/bundler/cli.rb
index ec3044ee5b..e342aa6edb 100644
--- a/lib/bundler/cli.rb
+++ b/lib/bundler/cli.rb
@@ -575,6 +575,7 @@ module Bundler
     method_option :rubocop, :type => :boolean, :desc => "Add rubocop to the generated Rakefile and gemspec. Set a default with `bundle config set gem.rubocop true`."
     method_option :test, :type => :string, :lazy_default => Bundler.settings["gem.test"] || "", :aliases => "-t", :banner => "Use the specified test framework for your library",
                          :desc => "Generate a test directory for your library, either rspec, minitest or test-unit. Set a default with `bundle config set gem.test rspec`."
+    method_option :ci,   :type => :string, :desc => "Generate CI configuration, either Github Actions, Travis CI, Gitlab CI or Circle CI. Set a default with `bundle config set gem.ci (github|travis|gitlab|circle)`"
     def gem(name)
     end
 
diff --git a/lib/bundler/cli/gem.rb b/lib/bundler/cli/gem.rb
index d069ca36f0..8770a98198 100644
--- a/lib/bundler/cli/gem.rb
+++ b/lib/bundler/cli/gem.rb
@@ -84,8 +84,6 @@ module Bundler
         config[:test] = test_framework
         config[:test_framework_version] = TEST_FRAMEWORK_VERSIONS[test_framework]
 
-        templates.merge!("travis.yml.tt" => ".travis.yml")
-
         case test_framework
         when "rspec"
           templates.merge!(
@@ -109,6 +107,25 @@ module Bundler
         end
       end
 
+      if ci_template = ask_and_set_ci
+        config[:ci] = ci_template
+
+        case ci_template
+        when "github"
+          templates.merge!(".github/workflows/main.yml.tt" => ".github/workflows/main.yml")
+          config[:ci] = "github"
+        when "travis"
+          templates.merge!("travis.yml.tt" => ".travis.yml")
+          config[:ci] = "travis"
+        when "gitlab"
+          templates.merge!(".gitlab-ci.yml.tt" => ".gitlab-ci.yml")
+          config[:ci] = "gitlab"
+        when "circle"
+          templates.merge!(".circleci/config.yml.tt" => ".circleci/config.yml")
+          config[:ci] = "circleci"
+        end
+      end
+
       if ask_and_set(:mit, "Do you want to license your code permissively under the MIT license?",
         "This means that any other developer or company will be legally allowed to use your code " \
         "for free as long as they admit you created it. You can read more about the MIT license " \
@@ -247,6 +264,35 @@ module Bundler
       end
     end
 
+    def ask_and_set_ci
+      ci_template = options[:ci] || Bundler.settings["gem.ci"]
+
+      if ci_template.nil?
+        Bundler.ui.confirm "Do you want to add Continuous Integration to your gem? " \
+        "Adding a CI service to your project helps ensure your project is well tested " \
+        "before shipping your gem to users. Bundler recommends several different services for testing "\
+        "your code. For more information about each service, see:\n" \
+        "* Travis CI:      https://travis-ci.org/\n" \
+        "* Github Actions: https://github.com/features/actions\n" \
+        "* Circle CI:      https://circleci.com/\n" \
+        "* Gitlab CI:      https://docs.gitlab.com/ee/ci/\n\n"
+
+        result = Bundler.ui.ask "Type 'github', 'travis', 'gitlab' or 'circle' to generate those test files now and " \
+          "in the future. github/travis/gitlab/circle/(none):"
+        if result =~ /github|travis|gitlab|circle/
+          ci_template = result
+        else
+          ci_template = false
+        end
+      end
+
+      if Bundler.settings["gem.ci"].nil?
+        Bundler.settings.set_global("gem.ci", ci_template)
+      end
+
+      ci_template
+    end
+
     def bundler_dependency_version
       v = Gem::Version.new(Bundler::VERSION)
       req = v.segments[0..1]
diff --git a/lib/bundler/templates/newgem/.circleci/config.yml.tt b/lib/bundler/templates/newgem/.circleci/config.yml.tt
new file mode 100644
index 0000000000..660943a3df
--- /dev/null
+++ b/lib/bundler/templates/newgem/.circleci/config.yml.tt
@@ -0,0 +1,13 @@
+version: 2.1
+jobs:
+  build:
+    docker:
+      - image: ruby:<%= RUBY_VERSION %>
+    steps:
+      - checkout
+      - run:
+          name: Run tests
+          command: |
+            gem install bundler -v <%= Bundler::Version %>
+            bundle install
+            bundle exec rake test
diff --git a/lib/bundler/templates/newgem/.github/workflows/main.yml.tt b/lib/bundler/templates/newgem/.github/workflows/main.yml.tt
new file mode 100644
index 0000000000..929901ac56
--- /dev/null
+++ b/lib/bundler/templates/newgem/.github/workflows/main.yml.tt
@@ -0,0 +1,18 @@
+name: Ruby
+
+on: [push,pull_request]
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v2
+    - name: Set up Ruby <%= ::Gem::Version.new(RUBY_VERSION).segments[0..1].join(".") %>
+      uses: actions/setup-ruby@v1
+      with:
+        ruby-version: <%= ::Gem::Version.new(RUBY_VERSION).segments[0..1].join(".") %>.x
+    - name: Build and test with Rake
+      run: |
+        gem install bundler -v <%= Bundler::VERSION %>
+        bundle install --jobs 4 --retry 3
+        bundle exec rake
diff --git a/lib/bundler/templates/newgem/.gitlab-ci.yml.tt b/lib/bundler/templates/newgem/.gitlab-ci.yml.tt
new file mode 100644
index 0000000000..0e71ff26a4
--- /dev/null
+++ b/lib/bundler/templates/newgem/.gitlab-ci.yml.tt
@@ -0,0 +1,9 @@
+image: ruby:<%= RUBY_VERSION %>
+
+before_script:
+  - gem install bundler -v <%= Bundler::VERSION %>
+  - bundle install
+
+example_job:
+  script:
+    - bundle exec rake