RubyGems - kettle-jem - Versions diffs - 7.1.28 → 7.1.30 - Mend

kettle-jem 7.1.28 → 7.1.30

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (74) hide show

data/lib/kettle/jem/tasks/template_task.rb CHANGED Viewed

@@ -18,7 +18,7 @@ module Kettle
               recipe_reports: []
             }
           else
-            Kettle::Jem.apply_project(project_root, env: env, run_options: effective_run_options)
+            Kettle::Jem.apply_project(project_root, env: env, run_options: effective_run_options.merge(defer_drift_check: true))
           end
           setup_env = Kettle::Jem::Tasks::InstallTask.setup_command_env(project_root, env)
           hook_step = Kettle::Jem::Tasks::InstallTask.hook_templates_step(project_root, effective_run_options)
@@ -33,7 +33,22 @@ module Kettle
             command_runner: command_runner,
             event_phase: "template"
           )
-          final_report = report.merge(mode: "template", template_steps: template_steps)
+          orchestration_changed_files = template_steps.flat_map do |step|
+            Array(step[:changed_files] || step["changed_files"])
+          end
+          changed_files = (Array(report[:changed_files]) + orchestration_changed_files).map(&:to_s).uniq.sort
+          final_report = report.merge(
+            mode: "template",
+            template_steps: template_steps,
+            changed_files: changed_files
+          )
+          if report.key?(:duplicate_drift)
+            final_report = Kettle::Jem.finalize_duplicate_drift(
+              project_root: project_root,
+              report: final_report,
+              run_options: effective_run_options
+            )
+          end
           Kettle::Jem.emit_summary_event(Kettle::Jem.event_stream_from_options(effective_run_options), final_report)
           final_report
         end
@@ -90,7 +105,7 @@ module Kettle
           return standalone_limit unless wave_jobs
           available_per_member = (cpu_count - wave_jobs) / wave_jobs
-          [standalone_limit, [available_per_member, 1].max].min
+          available_per_member.clamp(1, standalone_limit)
         end
         def family_wave_jobs(env)

data/lib/kettle/jem/templates/.devcontainer/devcontainer.json.example CHANGED Viewed

@@ -14,7 +14,7 @@
   // Use 'postCreateCommand' to run commands after the container is created.
   // First setup tree-sitter (auto-detects sudo requirement), then run bundle as the regular user
   // Use ${containerWorkspaceFolder} to get the actual workspace path in the container
-  "postCreateCommand": "bash ${containerWorkspaceFolder}/.devcontainer/scripts/setup-tree-sitter.sh --workspace=${containerWorkspaceFolder} && bundle update --bundler",
+  "postCreateCommand": "bash ${containerWorkspaceFolder}/.devcontainer/scripts/setup-tree-sitter.sh --workspace=${containerWorkspaceFolder} && bundle update --bundler=$(bundle exec ruby -e 'print Gem.loaded_specs.fetch(\"bundler\").version')",
   // Configure tool-specific properties.
   "customizations": {
     "jetbrains": {

data/lib/kettle/jem/templates/.git-hooks/prepare-commit-msg.example CHANGED Viewed

@@ -3,7 +3,6 @@
 # Fail on error and unset variables
 set -eu
-# Run the generated wrapper directly so hook execution does not depend on shell activation.
-# We are not using direnv exec here because mise and direnv can result in conflicting PATH settings:
-# See: https://mise.jdx.dev/direnv.html
-exec "kettle-commit-msg" "$@"
+# Resolve the installed gem executable through RubyGems, not a repository-local
+# Bundler binstub that may select a temporarily inconsistent project lockfile.
+exec env RUBYOPT= ruby -e 'require "rubygems"; load Gem.bin_path("kettle-dev", "kettle-commit-msg")' "$@"

data/lib/kettle/jem/templates/.github/workflows/coverage.yml.example CHANGED Viewed

@@ -6,6 +6,8 @@ permissions:
   id-token: write
 env:
+  # Kill stalled test workers instead of hanging until the CI job timeout.
+  TURBO_TESTS2_WATCHDOG_SECONDS: 900
   K_SOUP_COV_MIN_BRANCH: 100
   K_SOUP_COV_MIN_LINE: 100
   K_SOUP_COV_MIN_HARD: true
@@ -38,6 +40,7 @@ jobs:
     if: "github.event_name != 'push' || (!contains(github.event.head_commit.message, '[ci skip]') && !contains(github.event.head_commit.message, '[skip ci]'))"
     name: Code Coverage on ${{ matrix.ruby }}@current
     runs-on: ubuntu-latest
+    timeout-minutes: 30
     continue-on-error: ${{ matrix.experimental || endsWith(matrix.ruby, 'head') }}
     env: # $BUNDLE_GEMFILE must be set at job level, so it is set for all steps
       BUNDLE_GEMFILE: ${{ github.workspace }}/Appraisal.root.gemfile
@@ -59,7 +62,7 @@ jobs:
           persist-credentials: false
       - name: Setup Ruby & RubyGems
-        uses: appraisal-rb/setup-ruby-flash@925395edf973d2dc0a629919f407f3547a03d4b5 # v2.1 compatibility bundle installation
+        uses: appraisal-rb/setup-ruby-flash@6f8ad36ba7488db591541483afb5464d01e8861b # v2.14 compatibility bundle installation
         with:
           ruby-version: "${{ matrix.ruby }}"
           rubygems: "${{ matrix.rubygems }}"
@@ -79,7 +82,10 @@ jobs:
         id: bundleAppraisalAttempt2
         # If bundleAppraisalAttempt1 failed, try again here; Otherwise skip.
         if: ${{ steps.bundleAppraisalAttempt1.outcome == 'failure' }}
-        run: bundle exec appraisal ${{ matrix.appraisal }} install
+        run: |
+          rm -f gemfiles/${{ matrix.appraisal }}.gemfile.lock
+          rm -rf vendor/bundle "$HOME/.bundle/cache"
+          bundle exec appraisal ${{ matrix.appraisal }} install
       - name: Restore RSpec status log
         if: "${{!env.ACT}}"
@@ -99,4 +105,20 @@ jobs:
           test -s coverage/lcov.info
           test -s coverage/coverage.xml
+      # Preserve per-worker SimpleCov resultsets when the coverage gate fails.
+      # turbo_tests2 workers write coverage/turbo_tests/<TEST_ENV_NUMBER>/.resultset.json;
+      # if a worker's recorded hits are lost before collation the failure is otherwise
+      # invisible (examples all pass; only the merged total drops).
+      - name: Upload per-worker coverage resultsets on coverage failure
+        if: ${{ failure() }}
+        uses: actions/upload-artifact@cf430e030ddbb5b0abf93d22962f4752f3646cd9 # v7.0.2
+        with:
+          name: coverage-resultsets-${{ matrix.ruby }}-${{ github.run_id }}-${{ github.run_attempt }}
+          path: |
+            coverage/turbo_tests/**/.resultset.json
+            coverage/.resultset.json
+            coverage/resultset.json
+          if-no-files-found: warn
+          retention-days: 14
 {KJ|GITHUB_ACTIONS:COVERAGE_UPLOAD_STEPS}

data/lib/kettle/jem/templates/.github/workflows/current.yml.example CHANGED Viewed

@@ -29,19 +29,16 @@ concurrency:
 jobs:
   test:
     if: "github.event_name != 'push' || (!contains(github.event.head_commit.message, '[ci skip]') && !contains(github.event.head_commit.message, '[skip ci]'))"
-    name: Specs ${{ matrix.ruby }}@${{ matrix.appraisal }}
-    runs-on: ubuntu-latest
+    name: Specs ${{ matrix.os }} ${{ matrix.ruby }}@${{ matrix.appraisal }}
+    runs-on: ${{ matrix.os }}
+    timeout-minutes: 30
     env: # $BUNDLE_GEMFILE must be set at job level, so it is set for all steps
       BUNDLE_GEMFILE: ${{ github.workspace }}/Appraisal.root.gemfile
     strategy:
       matrix:
         include:
           # Ruby 4.0
-          - ruby: "ruby"
-            appraisal: "current"
-            exec_cmd: "{KJ|CI:EXEC_CMD}"
-            rubygems: latest
-            bundler: latest
+{KJ|CI:OS_MATRIX_ENTRIES}
     steps:
       - name: Checkout
@@ -50,7 +47,7 @@ jobs:
           persist-credentials: false
       - name: Setup Ruby & RubyGems
-        uses: appraisal-rb/setup-ruby-flash@925395edf973d2dc0a629919f407f3547a03d4b5 # v2.1 compatibility bundle installation
+        uses: appraisal-rb/setup-ruby-flash@6f8ad36ba7488db591541483afb5464d01e8861b # v2.14 bundle validation and compatibility installation
         with:
           ruby-version: ${{ matrix.ruby }}
           rubygems: ${{ matrix.rubygems }}
@@ -70,17 +67,19 @@ jobs:
         id: bundleAppraisalAttempt2
         # If bundleAppraisalAttempt1 failed, try again here; Otherwise skip.
         if: ${{ steps.bundleAppraisalAttempt1.outcome == 'failure' }}
-        run: bundle exec appraisal ${{ matrix.appraisal }} install
+        run: |
+          rm -f gemfiles/${{ matrix.appraisal }}.gemfile.lock
+          rm -rf vendor/bundle "$HOME/.bundle/cache"
+          bundle exec appraisal ${{ matrix.appraisal }} install
       - name: Restore RSpec status log
         if: "${{!env.ACT}}"
         uses: actions/cache@55cc8345863c7cc4c66a329aec7e433d2d1c52a9 # v6.1.0
         with:
           path: .rspec_status
-          key: rspec-status-current-${{matrix.ruby}}-${{matrix.appraisal}}-${{hashFiles('**/Gemfile.lock','Appraisal.root.gemfile','gemfiles/**/*.gemfile')}}-${{github.run_id}}-${{github.run_attempt}}
+          key: rspec-status-current-${{matrix.os}}-${{matrix.ruby}}-${{matrix.appraisal}}-${{hashFiles('**/Gemfile.lock','Appraisal.root.gemfile','gemfiles/**/*.gemfile')}}-${{github.run_id}}-${{github.run_attempt}}
           restore-keys: |
-            rspec-status-current-${{matrix.ruby}}-${{matrix.appraisal}}-${{hashFiles('**/Gemfile.lock','Appraisal.root.gemfile','gemfiles/**/*.gemfile')}}-
-            rspec-status-current-${{matrix.ruby}}-${{matrix.appraisal}}-
+            rspec-status-current-${{matrix.os}}-${{matrix.ruby}}-${{matrix.appraisal}}-${{hashFiles('**/Gemfile.lock','Appraisal.root.gemfile','gemfiles/**/*.gemfile')}}-
+            rspec-status-current-${{matrix.os}}-${{matrix.ruby}}-${{matrix.appraisal}}-
-      - name: Tests for ${{ matrix.ruby }} via ${{ matrix.exec_cmd }}
-        run: bundle exec appraisal ${{ matrix.appraisal }} bundle exec ${{ matrix.exec_cmd }}
+{KJ|CI:OS_TEST_STEPS}

data/lib/kettle/jem/templates/.github/workflows/dep-heads.yml.example CHANGED Viewed

@@ -5,6 +5,8 @@ permissions:
   contents: read
 env:
+  # Kill stalled test workers instead of hanging until the CI job timeout.
+  TURBO_TESTS2_WATCHDOG_SECONDS: 900
   K_SOUP_COV_DO: false
 on:
@@ -31,6 +33,7 @@ jobs:
     if: "github.event_name != 'push' || (!contains(github.event.head_commit.message, '[ci skip]') && !contains(github.event.head_commit.message, '[skip ci]'))"
     name: Specs ${{ matrix.ruby }}@${{ matrix.appraisal }}${{ matrix.name_extra || '' }}
     runs-on: ubuntu-latest
+    timeout-minutes: 30
     continue-on-error: ${{ matrix.experimental || endsWith(matrix.ruby, 'head') }}
     env: # $BUNDLE_GEMFILE must be set at job level, so it is set for all steps
       BUNDLE_GEMFILE: ${{ github.workspace }}/${{ matrix.bundle_gemfile || 'Appraisal.root.gemfile' }}
@@ -61,7 +64,7 @@ jobs:
       - name: Setup Ruby & RubyGems
         if: ${{ !env.ACT }}
-        uses: appraisal-rb/setup-ruby-flash@925395edf973d2dc0a629919f407f3547a03d4b5 # v2.1 compatibility bundle installation
+        uses: appraisal-rb/setup-ruby-flash@6f8ad36ba7488db591541483afb5464d01e8861b # v2.14 compatibility bundle installation
         with:
           ruby-version: ${{ matrix.ruby }}
           rubygems: ${{ matrix.rubygems }}
@@ -102,7 +105,7 @@ jobs:
         run: bundle exec ${{ matrix.exec_cmd }}
   truffleruby:
-    if: "(github.event_name != 'push' || (!contains(github.event.head_commit.message, '[ci skip]') && !contains(github.event.head_commit.message, '[skip ci]'))) && (github.event_name != 'pull_request' || startsWith(github.head_ref, 'engines/') || startsWith(github.head_ref, 'truffleruby/') || startsWith(github.head_ref, 'feature/release'))"
+    if: "(github.event_name != 'push' || (!contains(github.event.head_commit.message, '[ci skip]') && !contains(github.event.head_commit.message, '[skip ci]'))) && (github.event_name != 'pull_request' || startsWith(github.head_ref, 'engines/') || startsWith(github.head_ref, 'truffleruby/') || startsWith(github.head_ref, 'feature/release') || startsWith(github.event.pull_request.title, 'Release '))"
     name: Specs truffleruby@dep-heads
     runs-on: ubuntu-latest
     continue-on-error: ${{ matrix.experimental || endsWith(matrix.ruby, 'head') }}
@@ -134,7 +137,7 @@ jobs:
       - name: Setup Ruby & RubyGems
         if: ${{ !env.ACT }}
-        uses: appraisal-rb/setup-ruby-flash@925395edf973d2dc0a629919f407f3547a03d4b5 # v2.1 compatibility bundle installation
+        uses: appraisal-rb/setup-ruby-flash@6f8ad36ba7488db591541483afb5464d01e8861b # v2.14 compatibility bundle installation
         with:
           ruby-version: ${{ matrix.ruby }}
           rubygems: ${{ matrix.rubygems }}
@@ -175,7 +178,7 @@ jobs:
         run: bundle exec ${{ matrix.exec_cmd }}
   jruby:
-    if: "(github.event_name != 'push' || (!contains(github.event.head_commit.message, '[ci skip]') && !contains(github.event.head_commit.message, '[skip ci]'))) && (github.event_name != 'pull_request' || startsWith(github.head_ref, 'engines/') || startsWith(github.head_ref, 'jruby/') || startsWith(github.head_ref, 'feature/release'))"
+    if: "(github.event_name != 'push' || (!contains(github.event.head_commit.message, '[ci skip]') && !contains(github.event.head_commit.message, '[skip ci]'))) && (github.event_name != 'pull_request' || startsWith(github.head_ref, 'engines/') || startsWith(github.head_ref, 'jruby/') || startsWith(github.head_ref, 'feature/release') || startsWith(github.event.pull_request.title, 'Release '))"
     name: Specs jruby@dep-heads
     runs-on: ubuntu-latest
     continue-on-error: ${{ matrix.experimental || endsWith(matrix.ruby, 'head') }}
@@ -208,7 +211,7 @@ jobs:
       - name: Setup Ruby & RubyGems
         if: ${{ !env.ACT }}
-        uses: appraisal-rb/setup-ruby-flash@925395edf973d2dc0a629919f407f3547a03d4b5 # v2.1 compatibility bundle installation
+        uses: appraisal-rb/setup-ruby-flash@6f8ad36ba7488db591541483afb5464d01e8861b # v2.14 compatibility bundle installation
         with:
           ruby-version: ${{ matrix.ruby }}
           rubygems: ${{ matrix.rubygems }}

data/lib/kettle/jem/templates/.github/workflows/framework-ci.yml.example CHANGED Viewed

@@ -7,6 +7,8 @@ permissions:
   contents: read
 env:
+  # Kill stalled test workers instead of hanging until the CI job timeout.
+  TURBO_TESTS2_WATCHDOG_SECONDS: 900
   K_SOUP_COV_DO: false
 on:
@@ -33,6 +35,7 @@ jobs:
     if: "github.event_name != 'push' || (!contains(github.event.head_commit.message, '[ci skip]') && !contains(github.event.head_commit.message, '[skip ci]'))"
     name: Specs ${{ matrix.ruby }}@${{ matrix.framework_version }}
     runs-on: ubuntu-latest
+    timeout-minutes: 30
     continue-on-error: ${{ matrix.experimental || endsWith(matrix.ruby, 'head') }}
     env: # $BUNDLE_GEMFILE must be set at job level, so it is set for all steps
       BUNDLE_GEMFILE: ${{ github.workspace }}/Appraisal.root.gemfile
@@ -58,7 +61,7 @@ jobs:
           persist-credentials: false
       - name: Setup Ruby & RubyGems
-        uses: appraisal-rb/setup-ruby-flash@925395edf973d2dc0a629919f407f3547a03d4b5 # v2.1 compatibility bundle installation
+        uses: appraisal-rb/setup-ruby-flash@6f8ad36ba7488db591541483afb5464d01e8861b # v2.14 compatibility bundle installation
         with:
           ruby-version: "${{ matrix.ruby }}"
           rubygems: "${{ matrix.rubygems }}"

data/lib/kettle/jem/templates/.github/workflows/heads.yml.example CHANGED Viewed

@@ -4,6 +4,8 @@ permissions:
   contents: read
 env:
+  # Kill stalled test workers instead of hanging until the CI job timeout.
+  TURBO_TESTS2_WATCHDOG_SECONDS: 900
   K_SOUP_COV_DO: false
 on:
@@ -30,6 +32,7 @@ jobs:
     if: "github.event_name != 'push' || (!contains(github.event.head_commit.message, '[ci skip]') && !contains(github.event.head_commit.message, '[skip ci]'))"
     name: Specs ${{ matrix.ruby }}@${{ matrix.appraisal }}${{ matrix.name_extra || '' }}
     runs-on: ubuntu-latest
+    timeout-minutes: 30
     continue-on-error: ${{ matrix.experimental || endsWith(matrix.ruby, 'head') }}
     env: # $BUNDLE_GEMFILE must be set at job level, so it is set for all steps
       BUNDLE_GEMFILE: ${{ github.workspace }}/Appraisal.root.gemfile
@@ -54,7 +57,7 @@ jobs:
       - name: Setup Ruby & RubyGems
         if: ${{ !env.ACT }}
-        uses: appraisal-rb/setup-ruby-flash@925395edf973d2dc0a629919f407f3547a03d4b5 # v2.1 compatibility bundle installation
+        uses: appraisal-rb/setup-ruby-flash@6f8ad36ba7488db591541483afb5464d01e8861b # v2.14 compatibility bundle installation
         with:
           ruby-version: ${{ matrix.ruby }}
           rubygems: ${{ matrix.rubygems }}
@@ -73,69 +76,12 @@ jobs:
       # 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 bundleAppraisalAttempt1 failed, clean lock/vendor and retry; Otherwise skip.
         if: ${{ !env.ACT && steps.bundleAppraisalAttempt1.outcome == 'failure' }}
-        run: bundle exec appraisal ${{ matrix.appraisal }} install
-      - name: Restore RSpec status log
-        if: "${{!env.ACT}}"
-        uses: actions/cache@55cc8345863c7cc4c66a329aec7e433d2d1c52a9 # v6.1.0
-        with:
-          path: .rspec_status
-          key: rspec-status-heads-${{matrix.ruby}}-${{matrix.appraisal}}-${{hashFiles('**/Gemfile.lock','Appraisal.root.gemfile','gemfiles/**/*.gemfile')}}-${{github.run_id}}-${{github.run_attempt}}
-          restore-keys: |
-            rspec-status-heads-${{matrix.ruby}}-${{matrix.appraisal}}-${{hashFiles('**/Gemfile.lock','Appraisal.root.gemfile','gemfiles/**/*.gemfile')}}-
-            rspec-status-heads-${{matrix.ruby}}-${{matrix.appraisal}}-
-      - name: Tests for ${{ matrix.ruby }} via ${{ matrix.exec_cmd }}
-        if: ${{ !env.ACT }}
-        run: bundle exec appraisal ${{ matrix.appraisal }} bundle exec ${{ matrix.exec_cmd }}
-  truffleruby:
-    if: "(github.event_name != 'push' || (!contains(github.event.head_commit.message, '[ci skip]') && !contains(github.event.head_commit.message, '[skip ci]'))) && (github.event_name != 'pull_request' || startsWith(github.head_ref, 'engines/') || startsWith(github.head_ref, 'truffleruby/') || startsWith(github.head_ref, 'feature/release'))"
-    name: Specs truffleruby-head@head
-    runs-on: ubuntu-latest
-    continue-on-error: ${{ matrix.experimental || endsWith(matrix.ruby, 'head') }}
-    env:
-      BUNDLE_GEMFILE: ${{ github.workspace }}/Appraisal.root.gemfile
-    strategy:
-      fail-fast: true
-      matrix:
-        include:
-          - ruby: "truffleruby-head"
-            appraisal: "head"
-            exec_cmd: "{KJ|CI:EXEC_CMD}"
-            rubygems: default
-            bundler: default
-    steps:
-      - name: Checkout
-        if: ${{ !env.ACT }}
-        uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
-        with:
-          persist-credentials: false
-      - name: Setup Ruby & RubyGems
-        if: ${{ !env.ACT }}
-        uses: appraisal-rb/setup-ruby-flash@925395edf973d2dc0a629919f407f3547a03d4b5 # v2.1 compatibility bundle installation
-        with:
-          ruby-version: ${{ matrix.ruby }}
-          rubygems: ${{ matrix.rubygems }}
-          bundler: ${{ matrix.bundler }}
-          bundler-cache: true
-          manual-compatibility-bundle: true
-          gem-install-retries: 7
-      - name: "[Attempt 1] Appraisal for ${{ matrix.ruby }}@${{ matrix.appraisal }}"
-        id: bundleAppraisalAttempt1
-        if: ${{ !env.ACT }}
-        run: bundle exec appraisal ${{ matrix.appraisal }} install
-        continue-on-error: true
-      - name: "[Attempt 2] Appraisal for ${{ matrix.ruby }}@${{ matrix.appraisal }}"
-        id: bundleAppraisalAttempt2
-        if: ${{ !env.ACT && steps.bundleAppraisalAttempt1.outcome == 'failure' }}
-        run: bundle exec appraisal ${{ matrix.appraisal }} install
+        run: |
+          rm -f gemfiles/${{ matrix.appraisal }}.gemfile.lock
+          rm -rf vendor/bundle "$HOME/.bundle/cache"
+          bundle exec appraisal ${{ matrix.appraisal }} install
       - name: Restore RSpec status log
         if: "${{!env.ACT}}"
@@ -152,7 +98,7 @@ jobs:
         run: bundle exec appraisal ${{ matrix.appraisal }} bundle exec ${{ matrix.exec_cmd }}
   jruby:
-    if: "(github.event_name != 'push' || (!contains(github.event.head_commit.message, '[ci skip]') && !contains(github.event.head_commit.message, '[skip ci]'))) && (github.event_name != 'pull_request' || startsWith(github.head_ref, 'engines/') || startsWith(github.head_ref, 'jruby/') || startsWith(github.head_ref, 'feature/release'))"
+    if: "(github.event_name != 'push' || (!contains(github.event.head_commit.message, '[ci skip]') && !contains(github.event.head_commit.message, '[skip ci]'))) && (github.event_name != 'pull_request' || startsWith(github.head_ref, 'engines/') || startsWith(github.head_ref, 'jruby/') || startsWith(github.head_ref, 'feature/release') || startsWith(github.event.pull_request.title, 'Release '))"
     name: Specs jruby-head@head
     runs-on: ubuntu-latest
     continue-on-error: ${{ matrix.experimental || endsWith(matrix.ruby, 'head') }}
@@ -177,7 +123,7 @@ jobs:
       - name: Setup Ruby & RubyGems
         if: ${{ !env.ACT }}
-        uses: appraisal-rb/setup-ruby-flash@925395edf973d2dc0a629919f407f3547a03d4b5 # v2.1 compatibility bundle installation
+        uses: appraisal-rb/setup-ruby-flash@6f8ad36ba7488db591541483afb5464d01e8861b # v2.14 compatibility bundle installation
         with:
           ruby-version: ${{ matrix.ruby }}
           rubygems: ${{ matrix.rubygems }}
@@ -194,8 +140,12 @@ jobs:
       - name: "[Attempt 2] Appraisal for ${{ matrix.ruby }}@${{ matrix.appraisal }}"
         id: bundleAppraisalAttempt2
+        # If bundleAppraisalAttempt1 failed, clean lock/vendor and retry; Otherwise skip.
         if: ${{ !env.ACT && steps.bundleAppraisalAttempt1.outcome == 'failure' }}
-        run: bundle exec appraisal ${{ matrix.appraisal }} install
+        run: |
+          rm -f gemfiles/${{ matrix.appraisal }}.gemfile.lock
+          rm -rf vendor/bundle "$HOME/.bundle/cache"
+          bundle exec appraisal ${{ matrix.appraisal }} install
       - name: Restore RSpec status log
         if: "${{!env.ACT}}"

data/lib/kettle/jem/templates/.github/workflows/jruby-10.0.yml.example CHANGED Viewed

@@ -4,6 +4,15 @@ permissions:
   contents: read
 env:
+  # Kill stalled test workers instead of hanging until the CI job timeout.
+  TURBO_TESTS2_WATCHDOG_SECONDS: 1500
+  # Each turbo_tests2 worker is a full JVM subprocess; without a heap cap
+  # JRuby defaults to 1/4 of runner RAM per worker, and concurrent workers
+  # get OOM-killed silently mid-run (watchdog then reports total silence).
+  JRUBY_OPTS: "-J-Xmx1280m"
+  # Fewer, smaller JVM workers: bound workers x per-worker heap under the
+  # runner RAM so the kernel OOM killer never silences workers mid-run.
+  TURBO_TESTS2_MAX_PROCESSES: 2
   K_SOUP_COV_DO: false
 on:
@@ -27,9 +36,10 @@ concurrency:
 jobs:
   test:
-    if: "(github.event_name != 'push' || (!contains(github.event.head_commit.message, '[ci skip]') && !contains(github.event.head_commit.message, '[skip ci]'))) && (github.event_name != 'pull_request' || startsWith(github.head_ref, 'engines/') || startsWith(github.head_ref, 'jruby/') || startsWith(github.head_ref, 'feature/release'))"
+    if: "(github.event_name != 'push' || (!contains(github.event.head_commit.message, '[ci skip]') && !contains(github.event.head_commit.message, '[skip ci]'))) && (github.event_name != 'pull_request' || startsWith(github.head_ref, 'engines/') || startsWith(github.head_ref, 'jruby/') || startsWith(github.head_ref, 'feature/release') || startsWith(github.event.pull_request.title, 'Release '))"
     name: Specs ${{ matrix.ruby }}@${{ matrix.appraisal }}
     runs-on: ubuntu-latest
+    timeout-minutes: 30
     continue-on-error: ${{ matrix.experimental || endsWith(matrix.ruby, 'head') }}
     env: # $BUNDLE_GEMFILE must be set at job level, so it is set for all steps
       BUNDLE_GEMFILE: ${{ github.workspace }}/Appraisal.root.gemfile
@@ -53,7 +63,7 @@ jobs:
       - name: Setup Ruby & RubyGems
         if: ${{ !env.ACT }}
-        uses: appraisal-rb/setup-ruby-flash@925395edf973d2dc0a629919f407f3547a03d4b5 # v2.1 compatibility bundle installation
+        uses: appraisal-rb/setup-ruby-flash@6f8ad36ba7488db591541483afb5464d01e8861b # v2.14 compatibility bundle installation
         with:
           ruby-version: ${{ matrix.ruby }}
           rubygems: ${{ matrix.rubygems }}
@@ -74,7 +84,10 @@ jobs:
         id: bundleAppraisalAttempt2
         # If bundleAppraisalAttempt1 failed, try again here; Otherwise skip.
         if: ${{ steps.bundleAppraisalAttempt1.outcome == 'failure' && !env.ACT }}
-        run: bundle exec appraisal ${{ matrix.appraisal }} install
+        run: |
+          rm -f gemfiles/${{ matrix.appraisal }}.gemfile.lock
+          rm -rf vendor/bundle "$HOME/.bundle/cache"
+          bundle exec appraisal ${{ matrix.appraisal }} install
       - name: Restore RSpec status log
         if: "${{!env.ACT}}"

data/lib/kettle/jem/templates/.github/workflows/jruby-9.1.yml.example CHANGED Viewed

@@ -4,6 +4,15 @@ permissions:
   contents: read
 env:
+  # Kill stalled test workers instead of hanging until the CI job timeout.
+  TURBO_TESTS2_WATCHDOG_SECONDS: 1500
+  # Each turbo_tests2 worker is a full JVM subprocess; without a heap cap
+  # JRuby defaults to 1/4 of runner RAM per worker, and concurrent workers
+  # get OOM-killed silently mid-run (watchdog then reports total silence).
+  JRUBY_OPTS: "-J-Xmx1280m"
+  # Fewer, smaller JVM workers: bound workers x per-worker heap under the
+  # runner RAM so the kernel OOM killer never silences workers mid-run.
+  TURBO_TESTS2_MAX_PROCESSES: 2
   K_SOUP_COV_DO: false
 on:
@@ -27,9 +36,10 @@ concurrency:
 jobs:
   test:
-    if: "(github.event_name != 'push' || (!contains(github.event.head_commit.message, '[ci skip]') && !contains(github.event.head_commit.message, '[skip ci]'))) && (github.event_name != 'pull_request' || startsWith(github.head_ref, 'engines/') || startsWith(github.head_ref, 'jruby/') || startsWith(github.head_ref, 'feature/release'))"
+    if: "(github.event_name != 'push' || (!contains(github.event.head_commit.message, '[ci skip]') && !contains(github.event.head_commit.message, '[skip ci]'))) && (github.event_name != 'pull_request' || startsWith(github.head_ref, 'engines/') || startsWith(github.head_ref, 'jruby/') || startsWith(github.head_ref, 'feature/release') || startsWith(github.event.pull_request.title, 'Release '))"
     name: Specs ${{ matrix.ruby }}@${{ matrix.appraisal }}
     runs-on: ubuntu-22.04
+    timeout-minutes: 30
     continue-on-error: ${{ matrix.experimental || endsWith(matrix.ruby, 'head') }}
     env: # $BUNDLE_GEMFILE must be set at job level, so it is set for all steps
       BUNDLE_GEMFILE: ${{ github.workspace }}/Appraisal.root.gemfile
@@ -52,7 +62,7 @@ jobs:
       - name: Setup Ruby & RubyGems
         if: ${{ !env.ACT }}
-        uses: appraisal-rb/setup-ruby-flash@925395edf973d2dc0a629919f407f3547a03d4b5 # v2.1 compatibility bundle installation
+        uses: appraisal-rb/setup-ruby-flash@6f8ad36ba7488db591541483afb5464d01e8861b # v2.14 compatibility bundle installation
         with:
           ruby-version: ${{ matrix.ruby }}
           rubygems: ${{ matrix.rubygems }}
@@ -73,7 +83,10 @@ jobs:
         id: bundleAppraisalAttempt2
         # If bundleAppraisalAttempt1 failed, try again here; Otherwise skip.
         if: ${{ steps.bundleAppraisalAttempt1.outcome == 'failure' && !env.ACT }}
-        run: bundle exec appraisal ${{ matrix.appraisal }} install
+        run: |
+          rm -f gemfiles/${{ matrix.appraisal }}.gemfile.lock
+          rm -rf vendor/bundle "$HOME/.bundle/cache"
+          bundle exec appraisal ${{ matrix.appraisal }} install
       - name: Restore RSpec status log
         if: "${{!env.ACT}}"

data/lib/kettle/jem/templates/.github/workflows/jruby-9.2.yml.example CHANGED Viewed

@@ -4,6 +4,15 @@ permissions:
   contents: read
 env:
+  # Kill stalled test workers instead of hanging until the CI job timeout.
+  TURBO_TESTS2_WATCHDOG_SECONDS: 1500
+  # Each turbo_tests2 worker is a full JVM subprocess; without a heap cap
+  # JRuby defaults to 1/4 of runner RAM per worker, and concurrent workers
+  # get OOM-killed silently mid-run (watchdog then reports total silence).
+  JRUBY_OPTS: "-J-Xmx1280m"
+  # Fewer, smaller JVM workers: bound workers x per-worker heap under the
+  # runner RAM so the kernel OOM killer never silences workers mid-run.
+  TURBO_TESTS2_MAX_PROCESSES: 2
   K_SOUP_COV_DO: false
 on:
@@ -27,9 +36,10 @@ concurrency:
 jobs:
   test:
-    if: "(github.event_name != 'push' || (!contains(github.event.head_commit.message, '[ci skip]') && !contains(github.event.head_commit.message, '[skip ci]'))) && (github.event_name != 'pull_request' || startsWith(github.head_ref, 'engines/') || startsWith(github.head_ref, 'jruby/') || startsWith(github.head_ref, 'feature/release'))"
+    if: "(github.event_name != 'push' || (!contains(github.event.head_commit.message, '[ci skip]') && !contains(github.event.head_commit.message, '[skip ci]'))) && (github.event_name != 'pull_request' || startsWith(github.head_ref, 'engines/') || startsWith(github.head_ref, 'jruby/') || startsWith(github.head_ref, 'feature/release') || startsWith(github.event.pull_request.title, 'Release '))"
     name: Specs ${{ matrix.ruby }}@${{ matrix.appraisal }}
     runs-on: ubuntu-22.04
+    timeout-minutes: 30
     continue-on-error: ${{ matrix.experimental || endsWith(matrix.ruby, 'head') }}
     env: # $BUNDLE_GEMFILE must be set at job level, so it is set for all steps
       BUNDLE_GEMFILE: ${{ github.workspace }}/Appraisal.root.gemfile
@@ -52,7 +62,7 @@ jobs:
       - name: Setup Ruby & RubyGems
         if: ${{ !env.ACT }}
-        uses: appraisal-rb/setup-ruby-flash@925395edf973d2dc0a629919f407f3547a03d4b5 # v2.1 compatibility bundle installation
+        uses: appraisal-rb/setup-ruby-flash@6f8ad36ba7488db591541483afb5464d01e8861b # v2.14 compatibility bundle installation
         with:
           ruby-version: ${{ matrix.ruby }}
           rubygems: ${{ matrix.rubygems }}
@@ -78,7 +88,10 @@ jobs:
         id: bundleAppraisalAttempt2
         # If bundleAppraisalAttempt1 failed, try again here; Otherwise skip.
         if: ${{ steps.bundleAppraisalAttempt1.outcome == 'failure' && !env.ACT }}
-        run: bundle exec appraisal ${{ matrix.appraisal }} install
+        run: |
+          rm -f gemfiles/${{ matrix.appraisal }}.gemfile.lock
+          rm -rf vendor/bundle "$HOME/.bundle/cache"
+          bundle exec appraisal ${{ matrix.appraisal }} install
       - name: Restore RSpec status log
         if: "${{!env.ACT}}"

data/lib/kettle/jem/templates/.github/workflows/jruby-9.3.yml.example CHANGED Viewed

@@ -4,6 +4,15 @@ permissions:
   contents: read
 env:
+  # Kill stalled test workers instead of hanging until the CI job timeout.
+  TURBO_TESTS2_WATCHDOG_SECONDS: 1500
+  # Each turbo_tests2 worker is a full JVM subprocess; without a heap cap
+  # JRuby defaults to 1/4 of runner RAM per worker, and concurrent workers
+  # get OOM-killed silently mid-run (watchdog then reports total silence).
+  JRUBY_OPTS: "-J-Xmx1280m"
+  # Fewer, smaller JVM workers: bound workers x per-worker heap under the
+  # runner RAM so the kernel OOM killer never silences workers mid-run.
+  TURBO_TESTS2_MAX_PROCESSES: 2
   K_SOUP_COV_DO: false
 on:
@@ -27,9 +36,10 @@ concurrency:
 jobs:
   test:
-    if: "(github.event_name != 'push' || (!contains(github.event.head_commit.message, '[ci skip]') && !contains(github.event.head_commit.message, '[skip ci]'))) && (github.event_name != 'pull_request' || startsWith(github.head_ref, 'engines/') || startsWith(github.head_ref, 'jruby/') || startsWith(github.head_ref, 'feature/release'))"
+    if: "(github.event_name != 'push' || (!contains(github.event.head_commit.message, '[ci skip]') && !contains(github.event.head_commit.message, '[skip ci]'))) && (github.event_name != 'pull_request' || startsWith(github.head_ref, 'engines/') || startsWith(github.head_ref, 'jruby/') || startsWith(github.head_ref, 'feature/release') || startsWith(github.event.pull_request.title, 'Release '))"
     name: Specs ${{ matrix.ruby }}@${{ matrix.appraisal }}
     runs-on: ubuntu-22.04
+    timeout-minutes: 30
     continue-on-error: ${{ matrix.experimental || endsWith(matrix.ruby, 'head') }}
     env: # $BUNDLE_GEMFILE must be set at job level, so it is set for all steps
       BUNDLE_GEMFILE: ${{ github.workspace }}/Appraisal.root.gemfile
@@ -52,7 +62,7 @@ jobs:
       - name: Setup Ruby & RubyGems
         if: ${{ !env.ACT }}
-        uses: appraisal-rb/setup-ruby-flash@925395edf973d2dc0a629919f407f3547a03d4b5 # v2.1 compatibility bundle installation
+        uses: appraisal-rb/setup-ruby-flash@6f8ad36ba7488db591541483afb5464d01e8861b # v2.14 compatibility bundle installation
         with:
           ruby-version: ${{ matrix.ruby }}
           rubygems: ${{ matrix.rubygems }}
@@ -78,7 +88,10 @@ jobs:
         id: bundleAppraisalAttempt2
         # If bundleAppraisalAttempt1 failed, try again here; Otherwise skip.
         if: ${{ steps.bundleAppraisalAttempt1.outcome == 'failure' && !env.ACT }}
-        run: bundle exec appraisal ${{ matrix.appraisal }} install
+        run: |
+          rm -f gemfiles/${{ matrix.appraisal }}.gemfile.lock
+          rm -rf vendor/bundle "$HOME/.bundle/cache"
+          bundle exec appraisal ${{ matrix.appraisal }} install
       - name: Restore RSpec status log
         if: "${{!env.ACT}}"

data/lib/kettle/jem/templates/.github/workflows/jruby-9.4.yml.example CHANGED Viewed

@@ -4,6 +4,15 @@ permissions:
   contents: read
 env:
+  # Kill stalled test workers instead of hanging until the CI job timeout.
+  TURBO_TESTS2_WATCHDOG_SECONDS: 1500
+  # Each turbo_tests2 worker is a full JVM subprocess; without a heap cap
+  # JRuby defaults to 1/4 of runner RAM per worker, and concurrent workers
+  # get OOM-killed silently mid-run (watchdog then reports total silence).
+  JRUBY_OPTS: "-J-Xmx1280m"
+  # Fewer, smaller JVM workers: bound workers x per-worker heap under the
+  # runner RAM so the kernel OOM killer never silences workers mid-run.
+  TURBO_TESTS2_MAX_PROCESSES: 2
   K_SOUP_COV_DO: false
 on:
@@ -27,9 +36,10 @@ concurrency:
 jobs:
   test:
-    if: "(github.event_name != 'push' || (!contains(github.event.head_commit.message, '[ci skip]') && !contains(github.event.head_commit.message, '[skip ci]'))) && (github.event_name != 'pull_request' || startsWith(github.head_ref, 'engines/') || startsWith(github.head_ref, 'jruby/') || startsWith(github.head_ref, 'feature/release'))"
+    if: "(github.event_name != 'push' || (!contains(github.event.head_commit.message, '[ci skip]') && !contains(github.event.head_commit.message, '[skip ci]'))) && (github.event_name != 'pull_request' || startsWith(github.head_ref, 'engines/') || startsWith(github.head_ref, 'jruby/') || startsWith(github.head_ref, 'feature/release') || startsWith(github.event.pull_request.title, 'Release '))"
     name: Specs ${{ matrix.ruby }}@${{ matrix.appraisal }}
     runs-on: ubuntu-22.04
+    timeout-minutes: 30
     continue-on-error: ${{ matrix.experimental || endsWith(matrix.ruby, 'head') }}
     env: # $BUNDLE_GEMFILE must be set at job level, so it is set for all steps
       BUNDLE_GEMFILE: ${{ github.workspace }}/Appraisal.root.gemfile
@@ -52,7 +62,7 @@ jobs:
       - name: Setup Ruby & RubyGems
         if: ${{ !env.ACT }}
-        uses: appraisal-rb/setup-ruby-flash@925395edf973d2dc0a629919f407f3547a03d4b5 # v2.1 compatibility bundle installation
+        uses: appraisal-rb/setup-ruby-flash@6f8ad36ba7488db591541483afb5464d01e8861b # v2.14 compatibility bundle installation
         with:
           ruby-version: ${{ matrix.ruby }}
           rubygems: ${{ matrix.rubygems }}
@@ -78,7 +88,10 @@ jobs:
         id: bundleAppraisalAttempt2
         # If bundleAppraisalAttempt1 failed, try again here; Otherwise skip.
         if: ${{ steps.bundleAppraisalAttempt1.outcome == 'failure' && !env.ACT }}
-        run: bundle exec appraisal ${{ matrix.appraisal }} install
+        run: |
+          rm -f gemfiles/${{ matrix.appraisal }}.gemfile.lock
+          rm -rf vendor/bundle "$HOME/.bundle/cache"
+          bundle exec appraisal ${{ matrix.appraisal }} install
       - name: Restore RSpec status log
         if: "${{!env.ACT}}"