Merge pull request #3432 from brodock/user-agent-gitlab-ci

Report GitLab CI within bundler user-agent string
rubygems · Mar 27, 2020 · 7f84c7b · 7f84c7b
2 parents 29c5a91 + 6a92a9a
commit 7f84c7b
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/bundler/lib/bundler/fetcher.rb b/bundler/lib/bundler/fetcher.rb
@@ -229,6 +229,7 @@ def cis
         "BUILDBOX" => "buildbox",
         "GO_SERVER_URL" => "go",
         "SNAP_CI" => "snap",
+        "GITLAB_CI" => "gitlab",
         "CI_NAME" => ENV["CI_NAME"],
         "CI" => "ci",
       }

diff --git a/bundler/spec/bundler/fetcher_spec.rb b/bundler/spec/bundler/fetcher_spec.rb
@@ -150,9 +150,10 @@
       end
 
       it "from many CI" do
-        with_env_vars("TRAVIS" => "foo", "CI_NAME" => "my_ci") do
+        with_env_vars("TRAVIS" => "foo", "GITLAB_CI" => "gitlab", "CI_NAME" => "my_ci") do
           ci_part = fetcher.user_agent.split(" ").find {|x| x.start_with?("ci/") }
           expect(ci_part).to match("travis")
+          expect(ci_part).to match("gitlab")
           expect(ci_part).to match("my_ci")
         end
       end