@@ -580,6 +580,7 @@ jobs:
580580 --app-version "$update_version" \
581581 --mac-compression normal \
582582 --to dmg \
583+ --require-vela-cli \
583584 --json)"
584585 printf '%s\n' "$update_output" > "$update_build_json_path"
585586 {
@@ -647,7 +648,7 @@ jobs:
647648 run : |
648649 set -euo pipefail
649650 prefix="${{ steps.mac_arm64_tools_pack_cache_key.outputs.prefix }}"
650- keep=3
651+ keep=1
651652 cache_ids="$(gh cache list --key "$prefix" --sort created_at --order desc --limit 100 --json id,key,createdAt --jq ".[$keep:] | .[].id")"
652653 count=0
653654 while IFS= read -r cache_id; do
@@ -795,6 +796,7 @@ jobs:
795796 --mac-compression normal
796797 --to "${{ inputs.mac_x64_target }}"
797798 --json
799+ --require-vela-cli
798800 )
799801 case "${{ inputs.mac_x64_sign_mode }}" in
800802 no) ;;
@@ -828,6 +830,7 @@ jobs:
828830 --mac-compression normal
829831 --to "${{ inputs.mac_x64_target }}"
830832 --json
833+ --require-vela-cli
831834 )
832835 case "${{ inputs.mac_x64_sign_mode }}" in
833836 no) ;;
@@ -917,7 +920,7 @@ jobs:
917920 run : |
918921 set -euo pipefail
919922 prefix="${{ steps.mac_x64_tools_pack_cache_key.outputs.prefix }}"
920- keep=3
923+ keep=1
921924 cache_ids="$(gh cache list --key "$prefix" --sort created_at --order desc --limit 100 --json id,key,createdAt --jq ".[$keep:] | .[].id")"
922925 count=0
923926 while IFS= read -r cache_id; do
@@ -1055,7 +1058,7 @@ jobs:
10551058 $ErrorActionPreference = "Stop"
10561059 New-Item -ItemType Directory -Force -Path "${{ runner.temp }}\release-build\win_x64" | Out-Null
10571060 pnpm.cmd exec tools-pack win cleanup --dir "${{ runner.temp }}\tools-pack" --namespace release-beta-win --json
1058- $buildArgs = @("exec", "tools-pack", "win", "build", "--dir", "${{ runner.temp }}\tools-pack", "--cache-dir", "${{ runner.temp }}\tools-pack-cache", "--namespace", "release-beta-win", "--portable", "--app-version", "${{ needs.metadata.outputs.beta_version }}", "--to", "${{ inputs.win_x64_target }}", "--json")
1061+ $buildArgs = @("exec", "tools-pack", "win", "build", "--dir", "${{ runner.temp }}\tools-pack", "--cache-dir", "${{ runner.temp }}\tools-pack-cache", "--namespace", "release-beta-win", "--portable", "--app-version", "${{ needs.metadata.outputs.beta_version }}", "--to", "${{ inputs.win_x64_target }}", "--require-vela-cli", "-- json")
10591062 if ("${{ inputs.win_x64_sign_mode }}" -eq "on") { $buildArgs += "--signed" }
10601063 $buildOutput = pnpm.cmd @buildArgs
10611064 if ($LASTEXITCODE -ne 0) { throw "tools-pack win build failed with exit code $LASTEXITCODE" }
@@ -1072,7 +1075,7 @@ jobs:
10721075 Remove-Item -Recurse -Force -ErrorAction SilentlyContinue "${{ runner.temp }}\tools-pack-cache"
10731076 New-Item -ItemType Directory -Force -Path "${{ runner.temp }}\release-build\win_x64" | Out-Null
10741077 pnpm.cmd exec tools-pack win cleanup --dir "${{ runner.temp }}\tools-pack" --namespace release-beta-win --json
1075- $buildArgs = @("exec", "tools-pack", "win", "build", "--dir", "${{ runner.temp }}\tools-pack", "--cache-dir", "${{ runner.temp }}\tools-pack-cache", "--namespace", "release-beta-win", "--portable", "--app-version", "${{ needs.metadata.outputs.beta_version }}", "--to", "${{ inputs.win_x64_target }}", "--json")
1078+ $buildArgs = @("exec", "tools-pack", "win", "build", "--dir", "${{ runner.temp }}\tools-pack", "--cache-dir", "${{ runner.temp }}\tools-pack-cache", "--namespace", "release-beta-win", "--portable", "--app-version", "${{ needs.metadata.outputs.beta_version }}", "--to", "${{ inputs.win_x64_target }}", "--require-vela-cli", "-- json")
10761079 if ("${{ inputs.win_x64_sign_mode }}" -eq "on") { $buildArgs += "--signed" }
10771080 $buildOutput = pnpm.cmd @buildArgs
10781081 if ($LASTEXITCODE -ne 0) { throw "tools-pack win fallback build failed with exit code $LASTEXITCODE" }
@@ -1100,7 +1103,7 @@ jobs:
11001103 $match = [regex]::Match("${{ needs.metadata.outputs.beta_version }}", "^(?<base>\d+\.\d+\.\d+)-beta\.(?<number>\d+)$")
11011104 if (-not $match.Success) { throw "full Windows smoke requires a counted beta version; got ${{ needs.metadata.outputs.beta_version }}" }
11021105 $updateVersion = "{0}-beta.{1}" -f $match.Groups["base"].Value, ([int]$match.Groups["number"].Value + 1)
1103- $buildArgs = @("exec", "tools-pack", "win", "build", "--dir", "${{ runner.temp }}\release-work\win_x64\tools-pack-update-fixture", "--cache-dir", "${{ runner.temp }}\tools-pack-cache", "--namespace", "release-beta-win", "--app-version", $updateVersion, "--to", "nsis", "--json")
1106+ $buildArgs = @("exec", "tools-pack", "win", "build", "--dir", "${{ runner.temp }}\release-work\win_x64\tools-pack-update-fixture", "--cache-dir", "${{ runner.temp }}\tools-pack-cache", "--namespace", "release-beta-win", "--app-version", $updateVersion, "--to", "nsis", "--require-vela-cli", "-- json")
11041107 if ("${{ inputs.win_x64_sign_mode }}" -eq "on") { $buildArgs += "--signed" }
11051108 $updateOutput = pnpm.cmd @buildArgs
11061109 if ($LASTEXITCODE -ne 0) { throw "tools-pack win update fixture failed with exit code $LASTEXITCODE" }
@@ -1167,7 +1170,7 @@ jobs:
11671170 GH_TOKEN : ${{ github.token }}
11681171 run : |
11691172 $prefix = "${{ steps.win_tools_pack_cache_key.outputs.prefix }}"
1170- $keep = 3
1173+ $keep = 1
11711174 $caches = @(gh cache list --key $prefix --sort created_at --order desc --limit 100 --json id,key,createdAt | ConvertFrom-Json)
11721175 $stale = @($caches | Select-Object -Skip $keep)
11731176 foreach ($cache in $stale) { gh cache delete $cache.id }
0 commit comments