diff --git a/.github/workflows/ci.generate.ts b/.github/workflows/ci.generate.ts index 52be483f34e365..c8980180a09d2c 100755 --- a/.github/workflows/ci.generate.ts +++ b/.github/workflows/ci.generate.ts @@ -716,19 +716,6 @@ const ci = { "df -h", ].join("\n"), }, - { - name: "Build denort release", - if: [ - "matrix.job == 'test' &&", - "matrix.profile == 'release' &&", - "github.repository == 'denoland/deno'", - ].join("\n"), - run: [ - "df -h", - "cargo build --profile=release-slim --locked --bin denort", - "df -h", - ].join("\n"), - }, { // Run a minimal check to ensure that binary is not corrupted, regardless // of our build mode @@ -775,11 +762,10 @@ const ci = { "cd target/release", "zip -r deno-${{ matrix.arch }}-unknown-linux-gnu.zip deno", "shasum -a 256 deno-${{ matrix.arch }}-unknown-linux-gnu.zip > deno-${{ matrix.arch }}-unknown-linux-gnu.zip.sha256sum", - "./deno types > lib.deno.d.ts", - "cd ../release-slim", - "zip -r ../release/denort-${{ matrix.arch }}-unknown-linux-gnu.zip denort", - "cd ../release", + "strip denort", + "zip -r denort-${{ matrix.arch }}-unknown-linux-gnu.zip denort", "shasum -a 256 denort-${{ matrix.arch }}-unknown-linux-gnu.zip > denort-${{ matrix.arch }}-unknown-linux-gnu.zip.sha256sum", + "./deno types > lib.deno.d.ts", ].join("\n"), }, { @@ -804,9 +790,8 @@ const ci = { "cd target/release", "zip -r deno-${{ matrix.arch }}-apple-darwin.zip deno", "shasum -a 256 deno-${{ matrix.arch }}-apple-darwin.zip > deno-${{ matrix.arch }}-apple-darwin.zip.sha256sum", - "cd ../release-slim", - "zip -r ../release/denort-${{ matrix.arch }}-apple-darwin.zip denort", - "cd ../release", + "strip denort", + "zip -r denort-${{ matrix.arch }}-apple-darwin.zip denort", "shasum -a 256 denort-${{ matrix.arch }}-apple-darwin.zip > denort-${{ matrix.arch }}-apple-darwin.zip.sha256sum", ] .join("\n"), @@ -823,8 +808,7 @@ const ci = { run: [ "Compress-Archive -CompressionLevel Optimal -Force -Path target/release/deno.exe -DestinationPath target/release/deno-${{ matrix.arch }}-pc-windows-msvc.zip", "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", - - "Compress-Archive -CompressionLevel Optimal -Force -Path target/release-slim/denort.exe -DestinationPath target/release/denort-${{ matrix.arch }}-pc-windows-msvc.zip", + "Compress-Archive -CompressionLevel Optimal -Force -Path target/release/denort.exe -DestinationPath target/release/denort-${{ matrix.arch }}-pc-windows-msvc.zip", "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", ].join("\n"), }, diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index bb94c046145853..524af7ac368f24 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -419,15 +419,6 @@ jobs: df -h cargo build --release --locked --all-targets df -h - - name: Build denort release - if: |- - !(matrix.skip) && (matrix.job == 'test' && - matrix.profile == 'release' && - github.repository == 'denoland/deno') - run: |- - df -h - cargo build --profile=release-slim --locked --bin denort - df -h - name: Check deno binary if: '!(matrix.skip) && (matrix.job == ''test'')' run: 'target/${{ matrix.profile }}/deno eval "console.log(1+2)" | grep 3' @@ -457,11 +448,10 @@ jobs: cd target/release zip -r deno-${{ matrix.arch }}-unknown-linux-gnu.zip deno shasum -a 256 deno-${{ matrix.arch }}-unknown-linux-gnu.zip > deno-${{ matrix.arch }}-unknown-linux-gnu.zip.sha256sum - ./deno types > lib.deno.d.ts - cd ../release-slim - zip -r ../release/denort-${{ matrix.arch }}-unknown-linux-gnu.zip denort - cd ../release + strip denort + zip -r denort-${{ matrix.arch }}-unknown-linux-gnu.zip denort shasum -a 256 denort-${{ matrix.arch }}-unknown-linux-gnu.zip > denort-${{ matrix.arch }}-unknown-linux-gnu.zip.sha256sum + ./deno types > lib.deno.d.ts - name: Pre-release (mac) if: |- !(matrix.skip) && (matrix.os == 'macos' && @@ -477,9 +467,8 @@ jobs: cd target/release zip -r deno-${{ matrix.arch }}-apple-darwin.zip deno shasum -a 256 deno-${{ matrix.arch }}-apple-darwin.zip > deno-${{ matrix.arch }}-apple-darwin.zip.sha256sum - cd ../release-slim - zip -r ../release/denort-${{ matrix.arch }}-apple-darwin.zip denort - cd ../release + strip denort + zip -r denort-${{ matrix.arch }}-apple-darwin.zip denort shasum -a 256 denort-${{ matrix.arch }}-apple-darwin.zip > denort-${{ matrix.arch }}-apple-darwin.zip.sha256sum - name: Pre-release (windows) if: |- @@ -491,7 +480,7 @@ jobs: run: |- Compress-Archive -CompressionLevel Optimal -Force -Path target/release/deno.exe -DestinationPath target/release/deno-${{ matrix.arch }}-pc-windows-msvc.zip 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 - Compress-Archive -CompressionLevel Optimal -Force -Path target/release-slim/denort.exe -DestinationPath target/release/denort-${{ matrix.arch }}-pc-windows-msvc.zip + Compress-Archive -CompressionLevel Optimal -Force -Path target/release/denort.exe -DestinationPath target/release/denort-${{ matrix.arch }}-pc-windows-msvc.zip 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 - name: Upload canary to dl.deno.land if: |- diff --git a/Cargo.toml b/Cargo.toml index fa2813caedcf3a..8e7d446b01e337 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -251,11 +251,6 @@ incremental = true lto = true opt-level = 'z' # Optimize for size -[profile.release-slim] -inherits = "release" -panic = "abort" -strip = "symbols" - # Build release with debug symbols: cargo build --profile=release-with-debug [profile.release-with-debug] inherits = "release"