🧪 Fix head and old TruffleRuby CI retries

Author: pboling

.github/workflows/dep-heads.yml

@@ -57,6 +57,7 @@ jobs:
           - ruby: "jruby"
             appraisal: "dep-heads"
             exec_cmd: "kettle-test"
+            kettle_test_runner: "rspec"
             rubygems: default
             bundler: default
             experimental: true
@@ -93,4 +94,6 @@ jobs:
 
       - name: Tests for ${{ matrix.ruby }} via ${{ matrix.exec_cmd }}
         if: ${{ !env.ACT || (! startsWith(matrix.ruby, 'jruby') && !startsWith(matrix.ruby, 'truffleruby')) }}
+        env:
+          KETTLE_TEST_RUNNER: ${{ matrix.kettle_test_runner || 'turbo_tests2' }}
         run: bundle exec appraisal ${{ matrix.appraisal }} bundle exec ${{ matrix.exec_cmd }}

.github/workflows/heads.yml

@@ -56,6 +56,7 @@ jobs:
           - ruby: "jruby-head"
             appraisal: "head"
             exec_cmd: "kettle-test"
+            kettle_test_runner: "rspec"
             rubygems: default
             bundler: default
 
@@ -91,4 +92,6 @@ jobs:
 
       - name: Tests for ${{ matrix.ruby }} via ${{ matrix.exec_cmd }}
         if: ${{ !env.ACT || (! startsWith(matrix.ruby, 'jruby') && !startsWith(matrix.ruby, 'truffleruby')) }}
+        env:
+          KETTLE_TEST_RUNNER: ${{ matrix.kettle_test_runner || 'turbo_tests2' }}
         run: bundle exec appraisal ${{ matrix.appraisal }} bundle exec ${{ matrix.exec_cmd }}

.github/workflows/truffleruby-22.3.yml

@@ -61,20 +61,6 @@ jobs:
           bundler: ${{ matrix.bundler }}
           bundler-cache: true
 
-      - name: "[Attempt 1] Appraisal for ${{ matrix.ruby }}@${{ matrix.appraisal }}"
-        id: bundleAppraisalAttempt1
-        if: ${{ !env.ACT }}
-        run: bundle exec appraisal ${{ matrix.appraisal }} install
-        # Continue to the next step on failure
-        continue-on-error: true
-
-      # Effectively an automatic retry of the previous step.
-      - name: "[Attempt 2] Appraisal for ${{ matrix.ruby }}@${{ matrix.appraisal }}"
-        id: bundleAppraisalAttempt2
-        # If bundleAppraisalAttempt1 failed, try again here; Otherwise skip.
-        if: ${{ steps.bundleAppraisalAttempt1.outcome == 'failure' && !env.ACT }}
-        run: bundle exec appraisal ${{ matrix.appraisal }} install
-
       - name: Tests for ${{ matrix.ruby }} via ${{ matrix.exec_cmd }}
         if: ${{ !env.ACT }}
-        run: bundle exec appraisal ${{ matrix.appraisal }} bundle exec ${{ matrix.exec_cmd }}
+        run: bundle exec ${{ matrix.exec_cmd }}

.github/workflows/truffleruby-23.0.yml

@@ -61,20 +61,6 @@ jobs:
           bundler: ${{ matrix.bundler }}
           bundler-cache: true
 
-      - name: "[Attempt 1] Appraisal for ${{ matrix.ruby }}@${{ matrix.appraisal }}"
-        id: bundleAppraisalAttempt1
-        if: ${{ !env.ACT }}
-        run: bundle exec appraisal ${{ matrix.appraisal }} install
-        # Continue to the next step on failure
-        continue-on-error: true
-
-      # Effectively an automatic retry of the previous step.
-      - name: "[Attempt 2] Appraisal for ${{ matrix.ruby }}@${{ matrix.appraisal }}"
-        id: bundleAppraisalAttempt2
-        # If bundleAppraisalAttempt1 failed, try again here; Otherwise skip.
-        if: ${{ steps.bundleAppraisalAttempt1.outcome == 'failure' && !env.ACT }}
-        run: bundle exec appraisal ${{ matrix.appraisal }} install
-
       - name: Tests for ${{ matrix.ruby }} via ${{ matrix.exec_cmd }}
         if: ${{ !env.ACT }}
-        run: bundle exec appraisal ${{ matrix.appraisal }} bundle exec ${{ matrix.exec_cmd }}
+        run: bundle exec ${{ matrix.exec_cmd }}

Appraisals

@@ -106,6 +106,8 @@ end
 appraise "ruby-3-0" do
   eval_gemfile "modular/json/truffleruby_22_3.gemfile"
   eval_gemfile "modular/json/truffleruby_23_0.gemfile"
+  eval_gemfile "modular/uri/truffleruby_22_3.gemfile"
+  eval_gemfile "modular/uri/truffleruby_23_0.gemfile"
   eval_gemfile "modular/x_std_libs/r3.1/libs.gemfile"
   eval_gemfile "modular/faraday_v2.gemfile"
   eval_gemfile "modular/hashie_v5.gemfile"

gemfiles/modular/uri/truffleruby_22_3.gemfile

@@ -0,0 +1,6 @@
+# frozen_string_literal: true
+
+if RUBY_ENGINE == "truffleruby" && RUBY_ENGINE_VERSION.start_with?("22.3")
+  # uri 1.1.1 can crash old TruffleRuby's regexp engine during Bundler gemspec validation.
+  gem "uri", "~> 1.0", ">= 1.0.4"
+end

gemfiles/modular/uri/truffleruby_23_0.gemfile

@@ -0,0 +1,6 @@
+# frozen_string_literal: true
+
+if RUBY_ENGINE == "truffleruby" && RUBY_ENGINE_VERSION.start_with?("23.0")
+  # uri 1.1.1 can crash old TruffleRuby's regexp engine during Bundler gemspec validation.
+  gem "uri", "~> 1.0", ">= 1.0.4"
+end

gemfiles/ruby_3_0.gemfile

@@ -8,6 +8,10 @@ eval_gemfile("modular/json/truffleruby_22_3.gemfile")
 
 eval_gemfile("modular/json/truffleruby_23_0.gemfile")
 
+eval_gemfile("modular/uri/truffleruby_22_3.gemfile")
+
+eval_gemfile("modular/uri/truffleruby_23_0.gemfile")
+
 eval_gemfile("modular/x_std_libs/r3.1/libs.gemfile")
 
 eval_gemfile("modular/faraday_v2.gemfile")