diff options
| author | Hiroshi SHIBATA <[email protected]> | 2022-12-20 09:43:53 +0900 |
|---|---|---|
| committer | Hiroshi SHIBATA <[email protected]> | 2022-12-20 13:15:02 +0900 |
| commit | 18ba89093a0b214cd89f1567c037c239f094496d () | |
| tree | bb4e07c66cca5fd2da04da297e8c66fbf883fdad /lib/bundler/cli/gem.rb | |
| parent | ad1f61fe80dea7a1b1e8d27a4232d7b10b820960 (diff) | |
Merge RubyGems/Bundler master
Pick from https://.com/rubygems/rubygems/commit/ba3adad4d80038ffd7bea015da2f11d3e8a2ff82
Notes: Merged: https://.com/ruby/ruby/pull/6966
| -rw-r--r-- | lib/bundler/cli/gem.rb | 22 |
1 files changed, 17 insertions, 5 deletions
@@ -31,6 +31,7 @@ module Bundler @extension = options[:ext] validate_ext_name if @extension end def run @@ -134,8 +135,6 @@ module Bundler case config[:ci] when "" templates.merge!("/workflows/main.yml.tt" => "./workflows/main.yml") - when "travis" - templates.merge!("travis.yml.tt" => ".travis.yml") when "gitlab" templates.merge!("gitlab-ci.yml.tt" => ".gitlab-ci.yml") when "circle" @@ -308,12 +307,11 @@ module Bundler "* CircleCI: https://circleci.com/\n" \ "* Actions: https://.com/features/actions\n" \ "* GitLab CI: https://docs.gitlab.com/ee/ci/\n" \ - "* Travis CI: https://travis-ci.org/\n" \ "\n" Bundler.ui.info hint_text("ci") - result = Bundler.ui.ask "Enter a CI service. /travis/gitlab/circle/(none):" - if /|travis|gitlab|circle/.match?(result) ci_template = result else ci_template = false @@ -428,5 +426,19 @@ module Bundler def standard_version "1.3" end end end |