actions/cargo-binstall
1
0
Fork 0
mirror of https://github.com/cargo-bins/cargo-binstall.git synced 2025-04-20 12:38:43 +00:00
Code Issues Projects Releases Packages Wiki Activity

Run e2e test for release build and fix it by switching back to stable (#818)

Browse source 
* Run e2e-tests for release build
* Print `RUSTFLAGS` for justfile target build & check
* Fix CI: Disable miropt level 4
* Fix CI: Disable -Zbuild-std
* Disable `-Zgcc-ld=lld` and `-Zshare-generics` so that we can switch back to stable

Signed-off-by: Jiahao XU <Jiahao_XU@outlook.com>
This commit is contained in:
Jiahao XU 2023-02-28 22:53:57 +11:00 • committed by GitHub
parent 5b70e41966
commit 2bf70b6a01
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 20 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.github/workflows/release-build.yml vendored
View file

@ -55,7 +55,7 @@ jobs:
- name: Ensure release binary is runnable
if: "matrix.r"
run: ./target/${{ matrix.t }}/release/cargo-binstall -V
run: just e2e-tests
- if: inputs.publish
name: Upload to release

35
justfile
View file

@ -38,7 +38,7 @@ output-folder := if target != target-host { "target" / target / output-profile-f
output-path := output-folder / output-filename
# which tool to use for compiling
cargo-bin := if use-cargo-zigbuild != "" { "cargo-zigbuild" } else if use-cross != "" { "cross" } else { "cargo +nightly" }
cargo-bin := if use-cargo-zigbuild != "" { "cargo-zigbuild" } else if use-cross != "" { "cross" } else { "cargo" }
# cargo compile options
cargo-profile := if for-release != "" { "release" } else { "dev" }
@ -48,9 +48,9 @@ ci-or-no := if ci != "" { "ci" } else { "noci" }
# In release builds in CI, build the std library ourselves so it uses our
# compile profile, and optimise panic messages out with immediate abort.
cargo-buildstd := if (cargo-profile / ci-or-no) == "release/ci" {
" -Z build-std=std,panic_abort -Z build-std-features=panic_immediate_abort"
} else { "" }
cargo-buildstd := "" #if (cargo-profile / ci-or-no) == "release/ci" {
#" -Z build-std=std,panic_abort -Z build-std-features=panic_immediate_abort"
#} else { "" }
# In musl release builds in CI, statically link gcclibs.
rustc-gcclibs := if (cargo-profile / ci-or-no / target-libc) == "release/ci/musl" {
@ -82,7 +82,8 @@ cargo-split-debuginfo := if cargo-buildstd != "" { " --config='profile.release.s
win-arm64-ring16 := if target == "aarch64-pc-windows-msvc" { " --config='patch.crates-io.ring.git=\"https://github.com/awakecoding/ring\"' --config='patch.crates-io.ring.branch=\"0.16.20_alpha\"'" } else { "" }
# MIR optimisation level (defaults to 2, bring it up to 4 for release builds)
rustc-miropt := if for-release != "" { " -Z mir-opt-level=4" } else { "" }
# **DISABLED because it's buggy**
rustc-miropt := "" # if for-release != "" { " -Z mir-opt-level=4" } else { "" }
# Use rust-lld that is bundled with rustup to speedup linking
# and support for icf=safe.
@ -95,13 +96,13 @@ rustc-miropt := if for-release != "" { " -Z mir-opt-level=4" } else { "" }
#
# If cargo-zigbuild is used, then it will provide the lld linker.
# This option is disabled on windows since it not supported.
rust-lld := if use-cargo-zigbuild != "" {
""
} else if target-os != "windows" {
" -Z gcc-ld=lld"
} else {
""
}
rust-lld := "" #if use-cargo-zigbuild != "" {
#""
#} else if target-os != "windows" {
#" -Z gcc-ld=lld"
#} else {
#""
#}
# ICF: link-time identical code folding
#
@ -130,7 +131,7 @@ target-glibc-ver-postfix := if glibc-version != "" {
}
cargo-build-args := (if for-release != "" { " --release" } else { "" }) + (" --target ") + (target) + (target-glibc-ver-postfix) + (cargo-buildstd) + (if extra-build-args != "" { " " + extra-build-args } else { "" }) + (cargo-no-default-features) + (cargo-split-debuginfo) + (if cargo-features != "" { " --features " + cargo-features } else { "" }) + (win-arm64-ring16)
export RUSTFLAGS := "-Z share-generics " + (linker-plugin-lto) + (rustc-gcclibs) + (rustc-miropt) + (rust-lld) + (rustc-icf)
export RUSTFLAGS := (linker-plugin-lto) + (rustc-gcclibs) + (rustc-miropt) + (rust-lld) + (rustc-icf)
# libblocksruntime-dev provides compiler-rt
@ -147,15 +148,17 @@ ci-install-deps:
ci-install-deps:
toolchain components="":
rustup toolchain install nightly {{ if components != "" { "--component " + components } else { "" } }} --no-self-update --profile minimal
{{ if ci != "" { "rustup default nightly" } else { "rustup override set nightly" } }}
rustup toolchain install stable {{ if components != "" { "--component " + components } else { "" } }} --no-self-update --profile minimal
{{ if ci != "" { "rustup default stable" } else { "rustup override set stable" } }}
{{ if target != "" { "rustup target add " + target } else { "" } }}
build:
echo "env RUSTFLAGS=$RUSTFLAGS"
{{cargo-bin}} build {{cargo-build-args}}
check:
echo "env RUSTFLAGS=$RUSTFLAGS"
{{cargo-bin}} check {{cargo-build-args}}
get-output file outdir=".":
@ -167,7 +170,7 @@ get-binary outdir=".": (get-output output-filename outdir)
-chmod +x {{ outdir / output-filename }}
e2e-test file *arguments: (get-binary "e2e-tests")
cd e2e-tests && bash {{file}}.sh {{output-filename}} {{arguments}}
cd e2e-tests && env -u RUSTFLAGS bash {{file}}.sh {{output-filename}} {{arguments}}
e2e-test-live: (e2e-test "live")
e2e-test-manifest-path: (e2e-test "manifest-path")