Skip to content

Commit 53d7536

Browse files
sl0thentr0pysl0thentr0py
authored
ci(lockgen): Reorder gemfile eval (#2968)
1 parent 655869a commit 53d7536

1 file changed

Lines changed: 42 additions & 15 deletions

File tree

‎.github/workflows/update_lockfiles.yml‎

Lines changed: 42 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -58,16 +58,19 @@ jobs:
5858
- ruby_version: 'jruby-head'
5959
steps:
6060
- uses: actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5 # v4
61+
# Wrapper keys the lock to this cell (<cell>.gemfile -> <cell>.gemfile.lock).
62+
# Must exist before setup-ruby, which errors if BUNDLE_GEMFILE points at a missing file.
63+
- name: Write wrapper gemfile
64+
run: |
65+
mkdir -p gemfiles
66+
echo 'eval_gemfile "../Gemfile"' > "$BUNDLE_GEMFILE"
6167
- uses: ruby/setup-ruby@319994f95fa847cf3fb3cd3dbe89f6dcde9f178f # v1
6268
with:
6369
ruby-version: ${{ matrix.ruby_version }}
6470
bundler: latest
6571
bundler-cache: false
6672
- name: Resolve lockfile
6773
run: |
68-
mkdir -p gemfiles
69-
# Wrapper keys the lock to this cell (<cell>.gemfile -> <cell>.gemfile.lock).
70-
echo 'eval_gemfile "../Gemfile"' > "$BUNDLE_GEMFILE"
7174
bundle lock --update
7275
# Checksums need Bundler >= 2.5 (Ruby >= 3.0); older Rubies get version pinning only.
7376
bundle lock --add-checksums || echo "::warning::--add-checksums unsupported on $(bundle --version); version pinning only for ${{ matrix.ruby_version }}"
@@ -117,15 +120,19 @@ jobs:
117120
- { ruby_version: "3.4", rails_version: "7.0.0" }
118121
steps:
119122
- uses: actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5 # v4
123+
# Wrapper keys the lock to this cell (<cell>.gemfile -> <cell>.gemfile.lock).
124+
# Must exist before setup-ruby, which errors if BUNDLE_GEMFILE points at a missing file.
125+
- name: Write wrapper gemfile
126+
run: |
127+
mkdir -p gemfiles
128+
echo 'eval_gemfile "../Gemfile"' > "$BUNDLE_GEMFILE"
120129
- uses: ruby/setup-ruby@319994f95fa847cf3fb3cd3dbe89f6dcde9f178f # v1
121130
with:
122131
ruby-version: ${{ matrix.ruby_version }}
123132
bundler: latest
124133
bundler-cache: false
125134
- name: Resolve lockfile
126135
run: |
127-
mkdir -p gemfiles
128-
echo 'eval_gemfile "../Gemfile"' > "$BUNDLE_GEMFILE"
129136
bundle lock --update
130137
bundle lock --add-checksums || echo "::warning::--add-checksums unsupported on $(bundle --version); version pinning only for ${{ matrix.ruby_version }}"
131138
- uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 # v4
@@ -164,15 +171,19 @@ jobs:
164171
- ruby_version: jruby-head
165172
steps:
166173
- uses: actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5 # v4
174+
# Wrapper keys the lock to this cell (<cell>.gemfile -> <cell>.gemfile.lock).
175+
# Must exist before setup-ruby, which errors if BUNDLE_GEMFILE points at a missing file.
176+
- name: Write wrapper gemfile
177+
run: |
178+
mkdir -p gemfiles
179+
echo 'eval_gemfile "../Gemfile"' > "$BUNDLE_GEMFILE"
167180
- uses: ruby/setup-ruby@319994f95fa847cf3fb3cd3dbe89f6dcde9f178f # v1
168181
with:
169182
ruby-version: ${{ matrix.ruby_version }}
170183
bundler: latest
171184
bundler-cache: false
172185
- name: Resolve lockfile
173186
run: |
174-
mkdir -p gemfiles
175-
echo 'eval_gemfile "../Gemfile"' > "$BUNDLE_GEMFILE"
176187
bundle lock --update
177188
bundle lock --add-checksums || echo "::warning::--add-checksums unsupported on $(bundle --version); version pinning only for ${{ matrix.ruby_version }}"
178189
- uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 # v4
@@ -201,15 +212,19 @@ jobs:
201212
- ruby_version: 'jruby-head'
202213
steps:
203214
- uses: actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5 # v4
215+
# Wrapper keys the lock to this cell (<cell>.gemfile -> <cell>.gemfile.lock).
216+
# Must exist before setup-ruby, which errors if BUNDLE_GEMFILE points at a missing file.
217+
- name: Write wrapper gemfile
218+
run: |
219+
mkdir -p gemfiles
220+
echo 'eval_gemfile "../Gemfile"' > "$BUNDLE_GEMFILE"
204221
- uses: ruby/setup-ruby@319994f95fa847cf3fb3cd3dbe89f6dcde9f178f # v1
205222
with:
206223
ruby-version: ${{ matrix.ruby_version }}
207224
bundler: latest
208225
bundler-cache: false
209226
- name: Resolve lockfile
210227
run: |
211-
mkdir -p gemfiles
212-
echo 'eval_gemfile "../Gemfile"' > "$BUNDLE_GEMFILE"
213228
bundle lock --update
214229
bundle lock --add-checksums || echo "::warning::--add-checksums unsupported on $(bundle --version); version pinning only for ${{ matrix.ruby_version }}"
215230
- uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 # v4
@@ -238,15 +253,19 @@ jobs:
238253
- ruby_version: jruby-head
239254
steps:
240255
- uses: actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5 # v4
256+
# Wrapper keys the lock to this cell (<cell>.gemfile -> <cell>.gemfile.lock).
257+
# Must exist before setup-ruby, which errors if BUNDLE_GEMFILE points at a missing file.
258+
- name: Write wrapper gemfile
259+
run: |
260+
mkdir -p gemfiles
261+
echo 'eval_gemfile "../Gemfile"' > "$BUNDLE_GEMFILE"
241262
- uses: ruby/setup-ruby@319994f95fa847cf3fb3cd3dbe89f6dcde9f178f # v1
242263
with:
243264
ruby-version: ${{ matrix.ruby_version }}
244265
bundler: latest
245266
bundler-cache: false
246267
- name: Resolve lockfile
247268
run: |
248-
mkdir -p gemfiles
249-
echo 'eval_gemfile "../Gemfile"' > "$BUNDLE_GEMFILE"
250269
bundle lock --update
251270
bundle lock --add-checksums || echo "::warning::--add-checksums unsupported on $(bundle --version); version pinning only for ${{ matrix.ruby_version }}"
252271
- uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 # v4
@@ -274,15 +293,19 @@ jobs:
274293
- ruby_version: 'jruby-head'
275294
steps:
276295
- uses: actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5 # v4
296+
# Wrapper keys the lock to this cell (<cell>.gemfile -> <cell>.gemfile.lock).
297+
# Must exist before setup-ruby, which errors if BUNDLE_GEMFILE points at a missing file.
298+
- name: Write wrapper gemfile
299+
run: |
300+
mkdir -p gemfiles
301+
echo 'eval_gemfile "../Gemfile"' > "$BUNDLE_GEMFILE"
277302
- uses: ruby/setup-ruby@319994f95fa847cf3fb3cd3dbe89f6dcde9f178f # v1
278303
with:
279304
ruby-version: ${{ matrix.ruby_version }}
280305
bundler: latest
281306
bundler-cache: false
282307
- name: Resolve lockfile
283308
run: |
284-
mkdir -p gemfiles
285-
echo 'eval_gemfile "../Gemfile"' > "$BUNDLE_GEMFILE"
286309
bundle lock --update
287310
bundle lock --add-checksums || echo "::warning::--add-checksums unsupported on $(bundle --version); version pinning only for ${{ matrix.ruby_version }}"
288311
- uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 # v4
@@ -311,15 +334,19 @@ jobs:
311334
- ruby_version: 'jruby-head'
312335
steps:
313336
- uses: actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5 # v4
337+
# Wrapper keys the lock to this cell (<cell>.gemfile -> <cell>.gemfile.lock).
338+
# Must exist before setup-ruby, which errors if BUNDLE_GEMFILE points at a missing file.
339+
- name: Write wrapper gemfile
340+
run: |
341+
mkdir -p gemfiles
342+
echo 'eval_gemfile "../Gemfile"' > "$BUNDLE_GEMFILE"
314343
- uses: ruby/setup-ruby@319994f95fa847cf3fb3cd3dbe89f6dcde9f178f # v1
315344
with:
316345
ruby-version: ${{ matrix.ruby_version }}
317346
bundler: latest
318347
bundler-cache: false
319348
- name: Resolve lockfile
320349
run: |
321-
mkdir -p gemfiles
322-
echo 'eval_gemfile "../Gemfile"' > "$BUNDLE_GEMFILE"
323350
bundle lock --update
324351
bundle lock --add-checksums || echo "::warning::--add-checksums unsupported on $(bundle --version); version pinning only for ${{ matrix.ruby_version }}"
325352
- uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 # v4

0 commit comments

Comments
 (0)