Skip to content

Commit b90e554

Browse files
t3dotggclaude
andauthored
ci(release): macOS arm64 stops compressing a pnpm store it cannot save (pingdotgg#31955)
Co-authored-by: Claude Opus 5.5 <[email protected]>
1 parent cb8e0de commit b90e554

3 files changed

Lines changed: 16 additions & 1 deletion

File tree

‎.github/actions/setup-ci-deps/action.yml‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,10 @@ inputs:
1313
description: Arguments for `vp install`, such as filters. Empty installs the whole workspace.
1414
required: false
1515
default: ""
16+
save-pnpm-store:
17+
description: Set to "false" when a concurrent job with the same install args saves the pnpm store
18+
required: false
19+
default: "true"
1620
runs:
1721
using: composite
1822
steps:
@@ -125,9 +129,11 @@ runs:
125129
# A filtered install that started from the current full store adds nothing
126130
# worth a second copy of it. A stacked PR, based on a branch other than the
127131
# default, saves a ~1 GB store only its own reruns can read, so it only restores.
132+
# Concurrent jobs with the same install args reserve one key, so the losers
133+
# compress the store for nothing; all but one pass save-pnpm-store: false.
128134
- name: Save pnpm store
129135
if: >-
130-
inputs.install == 'true' &&
136+
inputs.install == 'true' && inputs.save-pnpm-store == 'true' &&
131137
(github.event_name != 'pull_request' || github.base_ref == github.event.repository.default_branch) &&
132138
steps.pnpm_cache.outputs.cache-hit != 'true' &&
133139
(steps.pnpm_store.outputs.namespace == 'full' ||

‎.github/workflows/release-desktop.yml‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,12 @@ on:
7777
required: false
7878
default: ""
7979
type: string
80+
# Whether this job saves the workspace pnpm store. Release's two Macs
81+
# install the same store on the same runner type, so only one saves it.
82+
save_pnpm_store:
83+
required: false
84+
default: true
85+
type: boolean
8086
version:
8187
required: true
8288
type: string
@@ -160,6 +166,7 @@ jobs:
160166
uses: ./.github/actions/setup-ci-deps
161167
with:
162168
install-args: --filter=@t3tools/desktop... --filter=t3... --filter=@t3tools/scripts...
169+
save-pnpm-store: ${{ inputs.save_pnpm_store }}
163170
env:
164171
pnpm_config_cache_dir: ${{ runner.temp }}/pnpm-metadata
165172

‎.github/workflows/release.yml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -653,6 +653,8 @@ jobs:
653653
resource_key: darwin-arm64
654654
cli_archive: true
655655
launch_check: true
656+
# desktop_mac_x64 saves the shared pnpm store; this job finishes last.
657+
save_pnpm_store: false
656658

657659
desktop_mac_x64:
658660
name: Desktop macOS x64

0 commit comments

Comments
 (0)