Skip to content

Commit 8c6676b

Browse files
committed
Merge branch 'dev' into merge-release/17.0-20260112162124
2 parents 62104d8 + 3bfad2c commit 8c6676b

File tree

730 files changed

+16317
-7589
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

730 files changed

+16317
-7589
lines changed

.github/workflows/docker.yml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ jobs:
103103
./docker/prod/setup/precompile-assets.sh
104104
# public/assets will be saved as artifact, so temporarily copying config file there as well
105105
cp config/frontend_assets.manifest.json public/assets/frontend_assets.manifest.json
106-
- uses: actions/upload-artifact@v5
106+
- uses: actions/upload-artifact@v6
107107
with:
108108
path: public/
109109
name: public-assets-${{ inputs.tag }}-${{ github.sha }}
@@ -163,7 +163,7 @@ jobs:
163163
run: |
164164
cp ./docker/prod/Dockerfile ./Dockerfile
165165
- name: Download precompiled public assets
166-
uses: actions/download-artifact@v6
166+
uses: actions/download-artifact@v7
167167
with:
168168
name: public-assets-${{ inputs.tag }}-${{ github.sha }}
169169
path: public/
@@ -208,7 +208,7 @@ jobs:
208208
${{ needs.setup.outputs.registry_image }}
209209
- name: Restore vendor/bundle
210210
id: restore-vendor-bundle
211-
uses: actions/cache/restore@v4
211+
uses: actions/cache/restore@v5
212212
with:
213213
path: |
214214
vendor/bundle
@@ -243,7 +243,7 @@ jobs:
243243
docker rm bundle
244244
- name: Save vendor/bundle
245245
id: save-vendor-bundle
246-
uses: actions/cache/save@v4
246+
uses: actions/cache/save@v5
247247
with:
248248
path: |
249249
vendor/bundle
@@ -292,7 +292,7 @@ jobs:
292292
digest="${{ steps.push.outputs.digest }}"
293293
touch "/tmp/digests/${digest#sha256:}"
294294
- name: Upload digest
295-
uses: actions/upload-artifact@v5
295+
uses: actions/upload-artifact@v6
296296
with:
297297
name: digests-${{ inputs.tag }}-${{ matrix.target }}-${{ matrix.digest }}
298298
path: /tmp/digests/*
@@ -308,13 +308,13 @@ jobs:
308308
- build
309309
steps:
310310
- name: Merge digests
311-
uses: actions/upload-artifact/merge@v5
311+
uses: actions/upload-artifact/merge@v6
312312
with:
313313
pattern: "digests-${{ inputs.tag }}-${{ matrix.target }}-${{ matrix.digest }}*"
314314
overwrite: true
315315
name: "merged-digests-${{ inputs.tag }}-${{ matrix.target }}-${{ github.run_number }}-${{ github.run_attempt }}"
316316
- name: Download digests
317-
uses: actions/download-artifact@v6
317+
uses: actions/download-artifact@v7
318318
with:
319319
name: "merged-digests-${{ inputs.tag }}-${{ matrix.target }}-${{ github.run_number }}-${{ github.run_attempt }}"
320320
path: /tmp/digests

0 commit comments

Comments
 (0)