Re-use GITHUB_ACTION variables for filtering bundler examples.

4 files changed, 4 insertions, 7 deletions

diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml
index c8933404a0..68fba08883 100644
--- a/.github/workflows/macos.yml
+++ b/.github/workflows/macos.yml
@@ -37,6 +37,5 @@ jobs:
         env:
           TESTOPTS: "$JOBS -q --tty=no"
           MSPECOPT: "-ff" # not using `-j` because sometimes `mspec -j` silently dies
-          CI: "true"
       - name: Leaked Globals
         run: make -s leaked-globals
diff --git a/.github/workflows/ubuntu.yml b/.github/workflows/ubuntu.yml
index 0ae5160be7..d7a6cbadda 100644
--- a/.github/workflows/ubuntu.yml
+++ b/.github/workflows/ubuntu.yml
@@ -37,7 +37,5 @@ jobs:
       - run: make $JOBS
       - name: make test-bundler/test-bundled-gems
         run: make -s ${{ matrix.test_task }}
-        env:
-          CI: "true"
       - name: Leaked Globals
         run: make -s leaked-globals
diff --git a/spec/bundler/bundler/source_spec.rb b/spec/bundler/bundler/source_spec.rb
index 9ae6b3e3eb..46d86937da 100644
--- a/spec/bundler/bundler/source_spec.rb
+++ b/spec/bundler/bundler/source_spec.rb
@@ -56,7 +56,7 @@ RSpec.describe Bundler::Source do
         context "with a different version" do
           let(:locked_gem) { double(:locked_gem, :name => "nokogiri", :version => "< 1.5") }
 
-          context "with color", :non_windows do
+          context "with color", :no_color_tty do
             before { Bundler.ui = Bundler::UI::Shell.new }
 
             it "should return a string with the spec name and version and locked spec version" do
@@ -77,7 +77,7 @@ RSpec.describe Bundler::Source do
           let(:spec) { double(:spec, :name => "nokogiri", :version => "1.6.1", :platform => rb) }
           let(:locked_gem) { double(:locked_gem, :name => "nokogiri", :version => "1.7.0") }
 
-          context "with color", :non_windows do
+          context "with color", :no_color_tty do
             before { Bundler.ui = Bundler::UI::Shell.new }
 
             it "should return a string with the locked spec version in yellow" do
@@ -98,7 +98,7 @@ RSpec.describe Bundler::Source do
           let(:spec) { double(:spec, :name => "nokogiri", :version => "1.7.1", :platform => rb) }
           let(:locked_gem) { double(:locked_gem, :name => "nokogiri", :version => "1.7.0") }
 
-          context "with color", :non_windows do
+          context "with color", :no_color_tty do
             before { Bundler.ui = Bundler::UI::Shell.new }
 
             it "should return a string with the locked spec version in green" do
diff --git a/spec/bundler/spec_helper.rb b/spec/bundler/spec_helper.rb
index 53e59991a2..2482fc03a3 100644
--- a/spec/bundler/spec_helper.rb
+++ b/spec/bundler/spec_helper.rb
@@ -73,7 +73,7 @@ RSpec.configure do |config|
   config.filter_run_excluding :git => RequirementChecker.against(git_version)
   config.filter_run_excluding :bundler => RequirementChecker.against(Bundler::VERSION.split(".")[0])
   config.filter_run_excluding :ruby_repo => !(ENV["BUNDLE_RUBY"] && ENV["BUNDLE_GEM"]).nil?
-  config.filter_run_excluding :non_windows => Gem.win_platform? || ENV["CI"]
+  config.filter_run_excluding :no_color_tty => Gem.win_platform? || !!ENV["GITHUB_ACTION"]
 
   config.filter_run_when_matching :focus unless ENV["CI"]