From 38e42845bcee01f3434a95fc21e462c96bc323c5 Mon Sep 17 00:00:00 2001 From: Jiahao XU <30436523+NobodyXu@users.noreply.github.com> Date: Mon, 5 May 2025 23:52:01 +1000 Subject: [PATCH] Bump ziglang to latest version (#2139) * Bump ziglang to latest version to fix the erorr in https://github.com/cargo-bins/cargo-binstall/actions/runs/14797824334/job/41549189656?pr=2137 Signed-off-by: Jiahao XU <30436523+NobodyXu@users.noreply.github.com> * Disable icf on linux since latest zig-cc does not support it Signed-off-by: Jiahao XU <30436523+NobodyXu@users.noreply.github.com> * Disable cargo-auditable Signed-off-by: Jiahao XU <30436523+NobodyXu@users.noreply.github.com> --------- Signed-off-by: Jiahao XU <30436523+NobodyXu@users.noreply.github.com> --- .github/workflows/release-packages.yml | 3 +-- justfile | 5 ++--- zigbuild-requirements.txt | 2 +- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/.github/workflows/release-packages.yml b/.github/workflows/release-packages.yml index 4291de23..61fef550 100644 --- a/.github/workflows/release-packages.yml +++ b/.github/workflows/release-packages.yml @@ -59,7 +59,6 @@ jobs: GLIBC_VERSION: ${{ matrix.g }} JUST_USE_CARGO_ZIGBUILD: ${{ matrix.c }} JUST_FOR_RELEASE: true - JUST_USE_AUDITABLE: true JUST_ENABLE_H3: true steps: @@ -77,7 +76,7 @@ jobs: - uses: ./.github/actions/just-setup with: - tools: cargo-auditable,rsign2,rage + tools: rsign2,rage env: # just-setup use binstall to install sccache, # which works better when we provide it with GITHUB_TOKEN. diff --git a/justfile b/justfile index f4590818..e9cb9f53 100644 --- a/justfile +++ b/justfile @@ -115,13 +115,12 @@ rust-lld := "" #if use-cargo-zigbuild != "" { # ICF: link-time identical code folding # -# On windows it works out of the box and on linux it uses -# rust-lld. +# On windows it works out of the box. rustc-icf := if for-release != "" { if target-os == "windows" { " -C link-arg=-Wl,--icf=safe" } else if target-os == "linux" { - " -C link-arg=-Wl,--icf=safe" + "" } else { "" } diff --git a/zigbuild-requirements.txt b/zigbuild-requirements.txt index 41ba0c5e..3f2a1dfc 100644 --- a/zigbuild-requirements.txt +++ b/zigbuild-requirements.txt @@ -2,4 +2,4 @@ cargo-zigbuild ###### Requirements with Version Specifiers ###### -ziglang < 0.11 # zig 0.11 causes link failure in our CI +ziglang