Skip to content

Commit 42f9559

Browse files
jpgaribottiolyasir
andauthored
infra: normalize prebuild merge jobs (***REMOVED***1678)
Align the nine prebuilds-*.yml merge jobs on a single canonical shape (`runs-on: ubuntu-latest`, `needs: prebuild`, `permissions: contents: write`, named "Download all build artifacts" / "Upload merged artifacts" steps using the same pinned action SHAs). Specific drift fixes: - prebuilds-qvac-lib-infer-nmtcpp.yml: pin runner to ubuntu-latest (was ubuntu-24.04), add contents: write, name the artifact steps. - prebuilds-qvac-lib-infer-whispercpp.yml: add contents: write. - prebuilds-qvac-lib-infer-onnx-tts.yml: drop the dead `environment: release` on the merge job; no step in that job reads a release-scoped secret (the matching prebuild job keeps `environment: release` for S3 model downloads). - prebuilds-qvac-lib-infer-onnx.yml and prebuilds-ocr-onnx.yml: reorder job keys and drop the `Replicate android artifacts` step. Bare's current prebuild resolver no longer needs the android-arm / android-ia32 / android-x64 duplicates of android-arm64. - prebuilds-qvac-lib-infer-llamacpp-embed.yml: drop a stray blank line inside the merge job. prebuilds-ocr-onnx.yml still keeps `environment: release`, `id-token: write`, and its extra actions/checkout + setup-aws-prebuild + `aws s3 cp` OCR model download + `models` artifact upload after the shared merge block; that behavior is unchanged. Co-authored-by: olyasir <sirkinolya@gmail.com>
1 parent 3f66b99 commit 42f9559

6 files changed

Lines changed: 11 additions & 22 deletions

.github/workflows/prebuilds-ocr-onnx.yml

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -258,11 +258,11 @@ jobs:
258258

259259
merge:
260260
runs-on: ubuntu-latest
261+
needs: prebuild
261262
environment: release
262263
permissions:
263264
contents: write
264265
id-token: write
265-
needs: prebuild
266266
steps:
267267
- name: Checkout repository
268268
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd ***REMOVED*** 6.0.2
@@ -277,13 +277,6 @@ jobs:
277277
path: prebuilds
278278
merge-multiple: true
279279

280-
- name: Replicate android artifacts
281-
run: |
282-
mkdir -p prebuilds/android-arm prebuilds/android-ia32 prebuilds/android-x64
283-
cp -rv prebuilds/android-arm64/* prebuilds/android-arm/
284-
cp -rv prebuilds/android-arm64/* prebuilds/android-x64/
285-
cp -rv prebuilds/android-arm64/* prebuilds/android-ia32/
286-
287280
- name: Upload merged artifacts
288281
uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f ***REMOVED*** 7.0.0
289282
with:

.github/workflows/prebuilds-qvac-lib-infer-llamacpp-embed.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -290,7 +290,6 @@ jobs:
290290
needs: prebuild
291291
permissions:
292292
contents: write
293-
294293
steps:
295294
- name: Download all build artifacts
296295
uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c ***REMOVED*** 8.0.1

.github/workflows/prebuilds-qvac-lib-infer-nmtcpp.yml

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -568,15 +568,19 @@ jobs:
568568
path: ${{ env.PKG_DIR }}/prebuilds/*
569569

570570
merge:
571-
runs-on: ubuntu-24.04
571+
runs-on: ubuntu-latest
572572
needs: prebuild
573+
permissions:
574+
contents: write
573575
steps:
574-
- uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c ***REMOVED*** 8.0.1
576+
- name: Download all build artifacts
577+
uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c ***REMOVED*** 8.0.1
575578
with:
576579
path: prebuilds
577580
merge-multiple: true
578581

579-
- uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f ***REMOVED*** 7.0.0
582+
- name: Upload merged artifacts
583+
uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f ***REMOVED*** 7.0.0
580584
with:
581585
name: prebuilds
582586
path: prebuilds

.github/workflows/prebuilds-qvac-lib-infer-onnx-tts.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -352,7 +352,6 @@ jobs:
352352

353353
merge:
354354
runs-on: ubuntu-latest
355-
environment: release
356355
needs: prebuild
357356
permissions:
358357
contents: write
@@ -369,4 +368,3 @@ jobs:
369368
name: prebuilds
370369
path: prebuilds
371370

372-

.github/workflows/prebuilds-qvac-lib-infer-onnx.yml

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -262,23 +262,16 @@ jobs:
262262

263263
merge:
264264
runs-on: ubuntu-latest
265+
needs: prebuild
265266
permissions:
266267
contents: write
267-
needs: prebuild
268268
steps:
269269
- name: Download all build artifacts
270270
uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c ***REMOVED*** 8.0.1
271271
with:
272272
path: prebuilds
273273
merge-multiple: true
274274

275-
- name: Replicate android artifacts
276-
run: |
277-
mkdir -p prebuilds/android-arm prebuilds/android-ia32 prebuilds/android-x64
278-
cp -rv prebuilds/android-arm64/* prebuilds/android-arm/
279-
cp -rv prebuilds/android-arm64/* prebuilds/android-x64/
280-
cp -rv prebuilds/android-arm64/* prebuilds/android-ia32/
281-
282275
- name: Upload merged artifacts
283276
uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f ***REMOVED*** 7.0.0
284277
with:

.github/workflows/prebuilds-qvac-lib-infer-whispercpp.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -279,6 +279,8 @@ jobs:
279279
merge:
280280
runs-on: ubuntu-latest
281281
needs: prebuild
282+
permissions:
283+
contents: write
282284
steps:
283285
- name: Download all build artifacts
284286
uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c ***REMOVED*** 8.0.1

0 commit comments

Comments
 (0)