Skip to content

Commit bf06b5f

Browse files
pbolingpboling
committed
🧩 Regenerate anonymous loader template output
1 parent f46551c commit bf06b5f

19 files changed

Lines changed: 168 additions & 175 deletions

‎.github/workflows/coverage.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ jobs:
108108

109109
- name: Upload coverage to CodeCov
110110
if: ${{ !env.ACT }}
111-
uses: codecov/codecov-action@fb8b3582c8e4def4969c97caa2f19720cb33a72f # v7.0.0
111+
uses: codecov/codecov-action@fb8b3582c8e4def4969c97caa2f19720cb33a72f # v7
112112
with:
113113
use_oidc: true
114114
disable_search: true

‎.github/workflows/dep-heads.yml‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ jobs:
5656
# jruby-10.0 (targets Ruby 3.4 compatibility)
5757
- ruby: "jruby"
5858
appraisal: "dep-heads"
59-
exec_cmd: "rspec"
59+
exec_cmd: "kettle-test"
6060
rubygems: default
6161
bundler: default
6262
experimental: true
@@ -93,5 +93,4 @@ jobs:
9393

9494
- name: Tests for ${{ matrix.ruby }} via ${{ matrix.exec_cmd }}
9595
if: ${{ !env.ACT || (! startsWith(matrix.ruby, 'jruby') && !startsWith(matrix.ruby, 'truffleruby')) }}
96-
timeout-minutes: 15
9796
run: bundle exec appraisal ${{ matrix.appraisal }} bundle exec ${{ matrix.exec_cmd }}

‎.github/workflows/heads.yml‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ jobs:
5555
# jruby-head
5656
- ruby: "jruby-head"
5757
appraisal: "head"
58-
exec_cmd: "rspec"
58+
exec_cmd: "kettle-test"
5959
rubygems: default
6060
bundler: default
6161

@@ -91,5 +91,4 @@ jobs:
9191

9292
- name: Tests for ${{ matrix.ruby }} via ${{ matrix.exec_cmd }}
9393
if: ${{ !env.ACT || (! startsWith(matrix.ruby, 'jruby') && !startsWith(matrix.ruby, 'truffleruby')) }}
94-
timeout-minutes: 15
9594
run: bundle exec appraisal ${{ matrix.appraisal }} bundle exec ${{ matrix.exec_cmd }}

‎.github/workflows/jruby.yml‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ jobs:
3939
# jruby-10.0 (targets Ruby 3.4 compatibility)
4040
- ruby: "jruby"
4141
appraisal: "current"
42-
exec_cmd: "rspec"
42+
exec_cmd: "kettle-test"
4343
rubygems: default
4444
bundler: default
4545
experimental: true
@@ -76,5 +76,4 @@ jobs:
7676

7777
- name: Tests for ${{ matrix.ruby }} via ${{ matrix.exec_cmd }}
7878
if: ${{ !env.ACT }}
79-
timeout-minutes: 15
8079
run: bundle exec appraisal ${{ matrix.appraisal }} bundle exec ${{ matrix.exec_cmd }}

‎.github/workflows/templating.yml‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,12 @@ jobs:
6161
bundler: ${{ matrix.bundler }}
6262
bundler-cache: true
6363

64+
- name: Update templating bootstrap dependencies
65+
env:
66+
BUNDLE_GEMFILE: ${{ github.workspace }}/Gemfile
67+
K_JEM_TEMPLATING: "true"
68+
run: bundle update nomono
69+
6470
- name: "[Attempt 1] Appraisal for ${{ matrix.ruby }}@${{ matrix.appraisal }}"
6571
id: bundleAppraisalAttempt1
6672
run: bundle exec appraisal ${{ matrix.appraisal }} install

‎.github/workflows/truffleruby-22.3.yml‎

Lines changed: 15 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ jobs:
3232
runs-on: ubuntu-22.04
3333
continue-on-error: ${{ matrix.experimental || endsWith(matrix.ruby, 'head') }}
3434
env: # $BUNDLE_GEMFILE must be set at job level, so it is set for all steps
35-
BUNDLE_GEMFILE: ${{ github.workspace }}/gemfiles/ruby_3_0.gemfile
35+
BUNDLE_GEMFILE: ${{ github.workspace }}/Appraisal.root.gemfile
3636
strategy:
3737
matrix:
3838
include:
@@ -59,13 +59,22 @@ jobs:
5959
ruby-version: ${{ matrix.ruby }}
6060
rubygems: ${{ matrix.rubygems }}
6161
bundler: ${{ matrix.bundler }}
62-
bundler-cache: false
62+
bundler-cache: true
6363

64-
- name: Bundle install
64+
- name: "[Attempt 1] Appraisal for ${{ matrix.ruby }}@${{ matrix.appraisal }}"
65+
id: bundleAppraisalAttempt1
6566
if: ${{ !env.ACT }}
66-
run: bundle install --jobs 4
67+
run: bundle exec appraisal ${{ matrix.appraisal }} install
68+
# Continue to the next step on failure
69+
continue-on-error: true
70+
71+
# Effectively an automatic retry of the previous step.
72+
- name: "[Attempt 2] Appraisal for ${{ matrix.ruby }}@${{ matrix.appraisal }}"
73+
id: bundleAppraisalAttempt2
74+
# If bundleAppraisalAttempt1 failed, try again here; Otherwise skip.
75+
if: ${{ steps.bundleAppraisalAttempt1.outcome == 'failure' && !env.ACT }}
76+
run: bundle exec appraisal ${{ matrix.appraisal }} install
6777

6878
- name: Tests for ${{ matrix.ruby }} via ${{ matrix.exec_cmd }}
6979
if: ${{ !env.ACT }}
70-
run: bundle exec ${{ matrix.exec_cmd }}
71-
continue-on-error: ${{ matrix.experimental }}
80+
run: bundle exec appraisal ${{ matrix.appraisal }} bundle exec ${{ matrix.exec_cmd }}

‎.github/workflows/truffleruby-23.0.yml‎

Lines changed: 15 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ jobs:
3232
runs-on: ubuntu-22.04
3333
continue-on-error: ${{ matrix.experimental || endsWith(matrix.ruby, 'head') }}
3434
env: # $BUNDLE_GEMFILE must be set at job level, so it is set for all steps
35-
BUNDLE_GEMFILE: ${{ github.workspace }}/gemfiles/ruby_3_0.gemfile
35+
BUNDLE_GEMFILE: ${{ github.workspace }}/Appraisal.root.gemfile
3636
strategy:
3737
matrix:
3838
include:
@@ -59,13 +59,22 @@ jobs:
5959
ruby-version: ${{ matrix.ruby }}
6060
rubygems: ${{ matrix.rubygems }}
6161
bundler: ${{ matrix.bundler }}
62-
bundler-cache: false
62+
bundler-cache: true
6363

64-
- name: Bundle install
64+
- name: "[Attempt 1] Appraisal for ${{ matrix.ruby }}@${{ matrix.appraisal }}"
65+
id: bundleAppraisalAttempt1
6566
if: ${{ !env.ACT }}
66-
run: bundle install --jobs 4
67+
run: bundle exec appraisal ${{ matrix.appraisal }} install
68+
# Continue to the next step on failure
69+
continue-on-error: true
70+
71+
# Effectively an automatic retry of the previous step.
72+
- name: "[Attempt 2] Appraisal for ${{ matrix.ruby }}@${{ matrix.appraisal }}"
73+
id: bundleAppraisalAttempt2
74+
# If bundleAppraisalAttempt1 failed, try again here; Otherwise skip.
75+
if: ${{ steps.bundleAppraisalAttempt1.outcome == 'failure' && !env.ACT }}
76+
run: bundle exec appraisal ${{ matrix.appraisal }} install
6777

6878
- name: Tests for ${{ matrix.ruby }} via ${{ matrix.exec_cmd }}
6979
if: ${{ !env.ACT }}
70-
run: bundle exec ${{ matrix.exec_cmd }}
71-
continue-on-error: ${{ matrix.experimental }}
80+
run: bundle exec appraisal ${{ matrix.appraisal }} bundle exec ${{ matrix.exec_cmd }}

‎.kettle-drift.lock‎

Lines changed: 2 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -21,36 +21,8 @@
2121
{
2222
"file": "CHANGELOG.md",
2323
"lines": [
24-
477,
25-
653
26-
]
27-
}
28-
],
29-
"- OAuth2::AccessToken\n- OAuth2::Client": [
30-
{
31-
"file": "REEK",
32-
"lines": [
33-
25,
34-
87,
35-
91
36-
]
37-
}
38-
],
39-
"- OAuth2::Client#protocol_relative_redirect_location\n- OAuth2::Client#resolve_redirect_location": [
40-
{
41-
"file": "REEK",
42-
"lines": [
43-
66,
44-
118
45-
]
46-
}
47-
],
48-
"- OAuth2::Client#resolve_redirect_location\n- OAuth2::Error#error_message": [
49-
{
50-
"file": "REEK",
51-
"lines": [
52-
67,
53-
119
24+
488,
25+
664
5426
]
5527
}
5628
],
@@ -92,19 +64,6 @@
9264
]
9365
}
9466
],
95-
"exclude:\n- OAuth2::AccessToken": [
96-
{
97-
"file": "REEK",
98-
"lines": [
99-
24,
100-
43,
101-
52,
102-
73,
103-
86,
104-
90
105-
]
106-
}
107-
],
10867
"exec_cmd: \"kettle-test\"\nrubygems: default": [
10968
{
11069
"file": ".github/workflows/dep-heads.yml",

‎AGENTS.md‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -163,16 +163,16 @@ and regenerate local finishing artifacts such as binstubs:
163163

164164
```bash
165165
# Standard run (quiet, non-interactive — the default)
166-
mise exec -C /path/to/project -- env K_JEM_TEMPLATING=true bundle exec kettle-jem install
166+
mise exec -C /path/to/project -- env K_JEM_TEMPLATING=true kettle-jem install
167167

168168
# Verbose output (see per-file detail)
169-
mise exec -C /path/to/project -- env K_JEM_TEMPLATING=true KETTLE_JEM_VERBOSE=true bundle exec kettle-jem install
169+
mise exec -C /path/to/project -- env K_JEM_TEMPLATING=true KETTLE_JEM_VERBOSE=true kettle-jem install
170170

171171
# Interactive mode (prompt before each change)
172-
mise exec -C /path/to/project -- env K_JEM_TEMPLATING=true bundle exec kettle-jem install --interactive
172+
mise exec -C /path/to/project -- env K_JEM_TEMPLATING=true kettle-jem install --interactive
173173

174174
# Scoped file update only; skips install finishing steps
175-
mise exec -C /path/to/project -- env K_JEM_TEMPLATING=true bundle exec kettle-jem template --only README.md
175+
mise exec -C /path/to/project -- env K_JEM_TEMPLATING=true kettle-jem template --only README.md
176176
```
177177

178178
Use the `kettle-jem` executable as the public entrypoint. The

‎Appraisal.root.gemfile‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,12 @@ source "https://gem.coop"
1515

1616
gemspec
1717

18-
if respond_to?(:generator_only)
19-
generator_only do
20-
eval_gemfile "gemfiles/modular/json/truffleruby_22_3.gemfile"
21-
eval_gemfile "gemfiles/modular/json/truffleruby_23_0.gemfile"
18+
if Gem::Version.new(RUBY_VERSION) >= Gem::Version.new("3.2")
19+
if respond_to?(:generator_only)
20+
generator_only do
21+
eval_gemfile "gemfiles/modular/style.gemfile"
22+
end
23+
else
24+
eval_gemfile "gemfiles/modular/style.gemfile"
2225
end
23-
else
24-
eval_gemfile "gemfiles/modular/json/truffleruby_22_3.gemfile"
25-
eval_gemfile "gemfiles/modular/json/truffleruby_23_0.gemfile"
2626
end

0 commit comments

Comments
 (0)