Skip to content

Commit 7002d20

Browse files
committed
chore: fix pre-release CI for macOS and Windows (#28707)
- Fix `strip` after `codesign` on macOS pre-release step. - Fix cwd assumption in windows pre-release step.
1 parent 59d8441 commit 7002d20

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

.github/workflows/ci.generate.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -817,15 +817,15 @@ const ci = {
817817
"APPLE_CODESIGN_PASSWORD": "${{ secrets.APPLE_CODESIGN_PASSWORD }}",
818818
},
819819
run: [
820+
"target/release/deno -A tools/release/create_symcache.ts target/release/deno-${{ matrix.arch }}-apple-darwin.symcache",
821+
"strip target/release/deno",
820822
'echo "Key is $(echo $APPLE_CODESIGN_KEY | base64 -d | wc -c) bytes"',
821823
"rcodesign sign target/release/deno " +
822824
"--code-signature-flags=runtime " +
823825
'--p12-password="$APPLE_CODESIGN_PASSWORD" ' +
824826
"--p12-file=<(echo $APPLE_CODESIGN_KEY | base64 -d) " +
825827
"--entitlements-xml-file=cli/entitlements.plist",
826828
"cd target/release",
827-
"./deno -A ../../tools/release/create_symcache.ts deno-${{ matrix.arch }}-apple-darwin.symcache",
828-
"strip ./deno",
829829
"zip -r deno-${{ matrix.arch }}-apple-darwin.zip deno",
830830
"shasum -a 256 deno-${{ matrix.arch }}-apple-darwin.zip > deno-${{ matrix.arch }}-apple-darwin.zip.sha256sum",
831831
"strip ./denort",
@@ -848,7 +848,7 @@ const ci = {
848848
"Get-FileHash target/release/deno-${{ matrix.arch }}-pc-windows-msvc.zip -Algorithm SHA256 | Format-List > target/release/deno-${{ matrix.arch }}-pc-windows-msvc.zip.sha256sum",
849849
"Compress-Archive -CompressionLevel Optimal -Force -Path target/release/denort.exe -DestinationPath target/release/denort-${{ matrix.arch }}-pc-windows-msvc.zip",
850850
"Get-FileHash target/release/denort-${{ matrix.arch }}-pc-windows-msvc.zip -Algorithm SHA256 | Format-List > target/release/denort-${{ matrix.arch }}-pc-windows-msvc.zip.sha256sum",
851-
"./deno.exe -A ../../tools/release/create_symcache.ts deno-${{ matrix.arch }}-pc-windows-msvc.symcache",
851+
"target/release/deno.exe -A tools/release/create_symcache.ts target/release/deno-${{ matrix.arch }}-pc-windows-msvc.symcache",
852852
].join("\n"),
853853
},
854854
{

.github/workflows/ci.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -485,11 +485,11 @@ jobs:
485485
APPLE_CODESIGN_KEY: '${{ secrets.APPLE_CODESIGN_KEY }}'
486486
APPLE_CODESIGN_PASSWORD: '${{ secrets.APPLE_CODESIGN_PASSWORD }}'
487487
run: |-
488+
target/release/deno -A tools/release/create_symcache.ts target/release/deno-${{ matrix.arch }}-apple-darwin.symcache
489+
strip target/release/deno
488490
echo "Key is $(echo $APPLE_CODESIGN_KEY | base64 -d | wc -c) bytes"
489491
rcodesign sign target/release/deno --code-signature-flags=runtime --p12-password="$APPLE_CODESIGN_PASSWORD" --p12-file=<(echo $APPLE_CODESIGN_KEY | base64 -d) --entitlements-xml-file=cli/entitlements.plist
490492
cd target/release
491-
./deno -A ../../tools/release/create_symcache.ts deno-${{ matrix.arch }}-apple-darwin.symcache
492-
strip ./deno
493493
zip -r deno-${{ matrix.arch }}-apple-darwin.zip deno
494494
shasum -a 256 deno-${{ matrix.arch }}-apple-darwin.zip > deno-${{ matrix.arch }}-apple-darwin.zip.sha256sum
495495
strip ./denort
@@ -507,7 +507,7 @@ jobs:
507507
Get-FileHash target/release/deno-${{ matrix.arch }}-pc-windows-msvc.zip -Algorithm SHA256 | Format-List > target/release/deno-${{ matrix.arch }}-pc-windows-msvc.zip.sha256sum
508508
Compress-Archive -CompressionLevel Optimal -Force -Path target/release/denort.exe -DestinationPath target/release/denort-${{ matrix.arch }}-pc-windows-msvc.zip
509509
Get-FileHash target/release/denort-${{ matrix.arch }}-pc-windows-msvc.zip -Algorithm SHA256 | Format-List > target/release/denort-${{ matrix.arch }}-pc-windows-msvc.zip.sha256sum
510-
./deno.exe -A ../../tools/release/create_symcache.ts deno-${{ matrix.arch }}-pc-windows-msvc.symcache
510+
target/release/deno.exe -A tools/release/create_symcache.ts target/release/deno-${{ matrix.arch }}-pc-windows-msvc.symcache
511511
- name: Upload canary to dl.deno.land
512512
if: |-
513513
!(matrix.skip) && (matrix.job == 'test' &&

0 commit comments

Comments
 (0)