authorgravatar for julius0216@outlook.comJulius Marminge <julius0216@outlook.com> 2026-05-06 16:04:28-07:00
committergravatar for noreply@github.comGitHub <noreply@github.com> 2026-05-06 23:04:28+00:00
loga74ed8ed32c2a949ec6fc91b9ae57c25ac96359a
tree958d8e7e773cd1a00cffa6476587dab312dc8a28
parent6c79039ce752c4bc6e2f6bcac929a543e9544774
signature Signed by PGP key B5690EEEBB952194

Revert "Cache desktop build assets in CI and release workflows" (#2568)

2 files changed, 18 insertions(+), 102 deletions(-)

.github/workflows/ci.yml+4-22
...@@ -25,9 +25,8 @@ jobs:...@@ -25,9 +25,8 @@ jobs:
25 with:25 with:
26 node-version-file: package.json26 node-version-file: package.json
2727
28 - id: bun_turbo_cache28 - name: Cache Bun and Turbo
29 name: Restore Bun and Turbo cache29 uses: actions/cache@v5
30 uses: actions/cache/restore@v5
31 with:30 with:
32 path: |31 path: |
33 ~/.bun/install/cache32 ~/.bun/install/cache
...@@ -36,9 +35,8 @@ jobs:...@@ -36,9 +35,8 @@ jobs:
36 restore-keys: |35 restore-keys: |
37 ${{ runner.os }}-bun-${{ hashFiles('bun.lock') }}-36 ${{ runner.os }}-bun-${{ hashFiles('bun.lock') }}-
3837
39 - id: playwright_cache38 - name: Cache Playwright browsers
40 name: Restore Playwright browsers39 uses: actions/cache@v5
41 uses: actions/cache/restore@v5
42 with:40 with:
43 path: ~/.cache/ms-playwright41 path: ~/.cache/ms-playwright
44 key: ${{ runner.os }}-playwright-${{ hashFiles('bun.lock') }}42 key: ${{ runner.os }}-playwright-${{ hashFiles('bun.lock') }}
...@@ -71,22 +69,6 @@ jobs:...@@ -71,22 +69,6 @@ jobs:
71 - name: Build desktop pipeline69 - name: Build desktop pipeline
72 run: bun run build:desktop70 run: bun run build:desktop
7371
74 - name: Save Playwright browsers
75 if: steps.playwright_cache.outputs.cache-hit != 'true'
76 uses: actions/cache/save@v5
77 with:
78 path: ~/.cache/ms-playwright
79 key: ${{ runner.os }}-playwright-${{ hashFiles('bun.lock') }}
80
81 - name: Save Bun and Turbo cache
82 if: steps.bun_turbo_cache.outputs.cache-hit != 'true'
83 uses: actions/cache/save@v5
84 with:
85 path: |
86 ~/.bun/install/cache
87 .turbo
88 key: ${{ runner.os }}-bun-${{ hashFiles('bun.lock') }}-${{ hashFiles('turbo.json') }}
89
90 - name: Verify preload bundle output72 - name: Verify preload bundle output
91 run: |73 run: |
92 test -f apps/desktop/dist-electron/preload.cjs74 test -f apps/desktop/dist-electron/preload.cjs
.github/workflows/release.yml+14-80
...@@ -311,9 +311,7 @@ jobs:...@@ -311,9 +311,7 @@ jobs:
311 shell: bash311 shell: bash
312 run: |312 run: |
313 set -euo pipefail313 set -euo pipefail
314 asset_dir="release-artifacts/desktop-${{ matrix.platform }}-${{ matrix.arch }}"314 mkdir -p release-publish
315 rm -rf "$asset_dir"
316 mkdir -p "$asset_dir"
317315
318 shopt -s nullglob316 shopt -s nullglob
319 for pattern in \317 for pattern in \
...@@ -324,13 +322,13 @@ jobs:...@@ -324,13 +322,13 @@ jobs:
324 "release/*.blockmap" \322 "release/*.blockmap" \
325 "release/*.yml"; do323 "release/*.yml"; do
326 for file in $pattern; do324 for file in $pattern; do
327 cp "$file" "$asset_dir"/325 cp "$file" release-publish/
328 done326 done
329 done327 done
330328
331 if [[ "${{ matrix.platform }}" == "mac" && "${{ matrix.arch }}" != "arm64" ]]; then329 if [[ "${{ matrix.platform }}" == "mac" && "${{ matrix.arch }}" != "arm64" ]]; then
332 shopt -s nullglob330 shopt -s nullglob
333 for manifest in "$asset_dir"/*-mac.yml; do331 for manifest in release-publish/*-mac.yml; do
334 mv "$manifest" "${manifest%.yml}-${{ matrix.arch }}.yml"332 mv "$manifest" "${manifest%.yml}-${{ matrix.arch }}.yml"
335 done333 done
336 fi334 fi
...@@ -342,23 +340,17 @@ jobs:...@@ -342,23 +340,17 @@ jobs:
342 # canonical manifest per channel.340 # canonical manifest per channel.
343 # if [[ "${{ matrix.platform }}" == "win" ]]; then341 # if [[ "${{ matrix.platform }}" == "win" ]]; then
344 # shopt -s nullglob342 # shopt -s nullglob
345 # for manifest in "$asset_dir"/*.yml; do343 # for manifest in release-publish/*.yml; do
346 # mv "$manifest" "${manifest%.yml}-win-${{ matrix.arch }}.yml"344 # mv "$manifest" "${manifest%.yml}-win-${{ matrix.arch }}.yml"
347 # done345 # done
348 # fi346 # fi
349347
350 assets=("$asset_dir"/*)348 - name: Upload build artifacts
351 if (( ${#assets[@]} == 0 )); then349 uses: actions/upload-artifact@v7
352 echo "No release assets were collected for ${{ matrix.platform }} ${{ matrix.arch }}." >&2
353 exit 1
354 fi
355
356 - name: Save build artifacts
357 uses: actions/cache/save@v5
358 with:350 with:
359 path: release-artifacts/desktop-${{ matrix.platform }}-${{ matrix.arch }}351 name: desktop-${{ matrix.platform }}-${{ matrix.arch }}
360 key: release-assets-${{ github.run_id }}-${{ matrix.platform }}-${{ matrix.arch }}-${{ github.run_attempt }}352 path: release-publish/*
361 enableCrossOsArchive: true353 if-no-files-found: error
362354
363 publish_cli:355 publish_cli:
364 name: Publish CLI to npm356 name: Publish CLI to npm
...@@ -431,70 +423,12 @@ jobs:...@@ -431,70 +423,12 @@ jobs:
431 - name: Install dependencies423 - name: Install dependencies
432 run: bun install --frozen-lockfile --filter=@t3tools/scripts424 run: bun install --frozen-lockfile --filter=@t3tools/scripts
433425
434 # Keep these restore steps in sync with the desktop build matrix.426 - name: Download all desktop artifacts
435 # Cache restore cannot enumerate a key pattern like download-artifact did.427 uses: actions/download-artifact@v8
436 - name: Restore macOS arm64 desktop assets
437 uses: actions/cache/restore@v5
438 with:
439 path: release-artifacts/desktop-mac-arm64
440 key: release-assets-${{ github.run_id }}-mac-arm64-${{ github.run_attempt }}
441 restore-keys: |
442 release-assets-${{ github.run_id }}-mac-arm64-
443 fail-on-cache-miss: true
444 enableCrossOsArchive: true
445
446 - name: Restore macOS x64 desktop assets
447 uses: actions/cache/restore@v5
448 with:
449 path: release-artifacts/desktop-mac-x64
450 key: release-assets-${{ github.run_id }}-mac-x64-${{ github.run_attempt }}
451 restore-keys: |
452 release-assets-${{ github.run_id }}-mac-x64-
453 fail-on-cache-miss: true
454 enableCrossOsArchive: true
455
456 - name: Restore Linux x64 desktop assets
457 uses: actions/cache/restore@v5
458 with:428 with:
459 path: release-artifacts/desktop-linux-x64429 pattern: desktop-*
460 key: release-assets-${{ github.run_id }}-linux-x64-${{ github.run_attempt }}430 merge-multiple: true
461 restore-keys: |431 path: release-assets
462 release-assets-${{ github.run_id }}-linux-x64-
463 fail-on-cache-miss: true
464 enableCrossOsArchive: true
465
466 - name: Restore Windows x64 desktop assets
467 uses: actions/cache/restore@v5
468 with:
469 path: release-artifacts/desktop-win-x64
470 key: release-assets-${{ github.run_id }}-win-x64-${{ github.run_attempt }}
471 restore-keys: |
472 release-assets-${{ github.run_id }}-win-x64-
473 fail-on-cache-miss: true
474 enableCrossOsArchive: true
475
476 - name: Stage desktop assets
477 shell: bash
478 run: |
479 set -euo pipefail
480 rm -rf release-assets
481 mkdir -p release-assets
482
483 shopt -s nullglob
484 for dir in release-artifacts/desktop-*; do
485 files=("$dir"/*)
486 if (( ${#files[@]} == 0 )); then
487 echo "No release assets were restored from $dir." >&2
488 exit 1
489 fi
490 cp "${files[@]}" release-assets/
491 done
492
493 assets=(release-assets/*)
494 if (( ${#assets[@]} == 0 )); then
495 echo "No desktop release assets were staged." >&2
496 exit 1
497 fi
498432
499 - name: Merge macOS updater manifests433 - name: Merge macOS updater manifests
500 run: |434 run: |