Skip to content

Commit b7fb5a5

Browse files
bartlomiejubartlomieju
authored
Revert "perf: build denort with panic = "abort" for releases (denoland#27507)" (denoland#27573)
Also reverts denoland#27518 The reason is that it takes too long to build these two binaries on Mac ARM runners as it stands. We're gonna try to reland this next week, after sorting out situation with these runners.
1 parent b6f2646 commit b7fb5a5

File tree

3 files changed

+12
-44
lines changed

3 files changed

+12
-44
lines changed

‎.github/workflows/ci.generate.ts‎

Lines changed: 6 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -716,19 +716,6 @@ const ci = {
716716
"df -h",
717717
].join("\n"),
718718
},
719-
{
720-
name: "Build denort release",
721-
if: [
722-
"matrix.job == 'test' &&",
723-
"matrix.profile == 'release' &&",
724-
"github.repository == 'denoland/deno'",
725-
].join("\n"),
726-
run: [
727-
"df -h",
728-
"cargo build --profile=release-slim --locked --bin denort",
729-
"df -h",
730-
].join("\n"),
731-
},
732719
{
733720
// Run a minimal check to ensure that binary is not corrupted, regardless
734721
// of our build mode
@@ -775,11 +762,10 @@ const ci = {
775762
"cd target/release",
776763
"zip -r deno-${{ matrix.arch }}-unknown-linux-gnu.zip deno",
777764
"shasum -a 256 deno-${{ matrix.arch }}-unknown-linux-gnu.zip > deno-${{ matrix.arch }}-unknown-linux-gnu.zip.sha256sum",
778-
"./deno types > lib.deno.d.ts",
779-
"cd ../release-slim",
780-
"zip -r ../release/denort-${{ matrix.arch }}-unknown-linux-gnu.zip denort",
781-
"cd ../release",
765+
"strip denort",
766+
"zip -r denort-${{ matrix.arch }}-unknown-linux-gnu.zip denort",
782767
"shasum -a 256 denort-${{ matrix.arch }}-unknown-linux-gnu.zip > denort-${{ matrix.arch }}-unknown-linux-gnu.zip.sha256sum",
768+
"./deno types > lib.deno.d.ts",
783769
].join("\n"),
784770
},
785771
{
@@ -804,9 +790,8 @@ const ci = {
804790
"cd target/release",
805791
"zip -r deno-${{ matrix.arch }}-apple-darwin.zip deno",
806792
"shasum -a 256 deno-${{ matrix.arch }}-apple-darwin.zip > deno-${{ matrix.arch }}-apple-darwin.zip.sha256sum",
807-
"cd ../release-slim",
808-
"zip -r ../release/denort-${{ matrix.arch }}-apple-darwin.zip denort",
809-
"cd ../release",
793+
"strip denort",
794+
"zip -r denort-${{ matrix.arch }}-apple-darwin.zip denort",
810795
"shasum -a 256 denort-${{ matrix.arch }}-apple-darwin.zip > denort-${{ matrix.arch }}-apple-darwin.zip.sha256sum",
811796
]
812797
.join("\n"),
@@ -823,8 +808,7 @@ const ci = {
823808
run: [
824809
"Compress-Archive -CompressionLevel Optimal -Force -Path target/release/deno.exe -DestinationPath target/release/deno-${{ matrix.arch }}-pc-windows-msvc.zip",
825810
"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",
826-
827-
"Compress-Archive -CompressionLevel Optimal -Force -Path target/release-slim/denort.exe -DestinationPath target/release/denort-${{ matrix.arch }}-pc-windows-msvc.zip",
811+
"Compress-Archive -CompressionLevel Optimal -Force -Path target/release/denort.exe -DestinationPath target/release/denort-${{ matrix.arch }}-pc-windows-msvc.zip",
828812
"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",
829813
].join("\n"),
830814
},

‎.github/workflows/ci.yml‎

Lines changed: 6 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -419,15 +419,6 @@ jobs:
419419
df -h
420420
cargo build --release --locked --all-targets
421421
df -h
422-
- name: Build denort release
423-
if: |-
424-
!(matrix.skip) && (matrix.job == 'test' &&
425-
matrix.profile == 'release' &&
426-
github.repository == 'denoland/deno')
427-
run: |-
428-
df -h
429-
cargo build --profile=release-slim --locked --bin denort
430-
df -h
431422
- name: Check deno binary
432423
if: '!(matrix.skip) && (matrix.job == ''test'')'
433424
run: 'target/${{ matrix.profile }}/deno eval "console.log(1+2)" | grep 3'
@@ -457,11 +448,10 @@ jobs:
457448
cd target/release
458449
zip -r deno-${{ matrix.arch }}-unknown-linux-gnu.zip deno
459450
shasum -a 256 deno-${{ matrix.arch }}-unknown-linux-gnu.zip > deno-${{ matrix.arch }}-unknown-linux-gnu.zip.sha256sum
460-
./deno types > lib.deno.d.ts
461-
cd ../release-slim
462-
zip -r ../release/denort-${{ matrix.arch }}-unknown-linux-gnu.zip denort
463-
cd ../release
451+
strip denort
452+
zip -r denort-${{ matrix.arch }}-unknown-linux-gnu.zip denort
464453
shasum -a 256 denort-${{ matrix.arch }}-unknown-linux-gnu.zip > denort-${{ matrix.arch }}-unknown-linux-gnu.zip.sha256sum
454+
./deno types > lib.deno.d.ts
465455
- name: Pre-release (mac)
466456
if: |-
467457
!(matrix.skip) && (matrix.os == 'macos' &&
@@ -477,9 +467,8 @@ jobs:
477467
cd target/release
478468
zip -r deno-${{ matrix.arch }}-apple-darwin.zip deno
479469
shasum -a 256 deno-${{ matrix.arch }}-apple-darwin.zip > deno-${{ matrix.arch }}-apple-darwin.zip.sha256sum
480-
cd ../release-slim
481-
zip -r ../release/denort-${{ matrix.arch }}-apple-darwin.zip denort
482-
cd ../release
470+
strip denort
471+
zip -r denort-${{ matrix.arch }}-apple-darwin.zip denort
483472
shasum -a 256 denort-${{ matrix.arch }}-apple-darwin.zip > denort-${{ matrix.arch }}-apple-darwin.zip.sha256sum
484473
- name: Pre-release (windows)
485474
if: |-
@@ -491,7 +480,7 @@ jobs:
491480
run: |-
492481
Compress-Archive -CompressionLevel Optimal -Force -Path target/release/deno.exe -DestinationPath target/release/deno-${{ matrix.arch }}-pc-windows-msvc.zip
493482
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
494-
Compress-Archive -CompressionLevel Optimal -Force -Path target/release-slim/denort.exe -DestinationPath target/release/denort-${{ matrix.arch }}-pc-windows-msvc.zip
483+
Compress-Archive -CompressionLevel Optimal -Force -Path target/release/denort.exe -DestinationPath target/release/denort-${{ matrix.arch }}-pc-windows-msvc.zip
495484
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
496485
- name: Upload canary to dl.deno.land
497486
if: |-

‎Cargo.toml‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -251,11 +251,6 @@ incremental = true
251251
lto = true
252252
opt-level = 'z' # Optimize for size
253253

254-
[profile.release-slim]
255-
inherits = "release"
256-
panic = "abort"
257-
strip = "symbols"
258-
259254
# Build release with debug symbols: cargo build --profile=release-with-debug
260255
[profile.release-with-debug]
261256
inherits = "release"

0 commit comments

Comments
 (0)