diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 6dc6df6..4ed12e2 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -20,6 +20,7 @@ on: env: CARGO_TERM_COLOR: always + BOFLINK_TEST_CLANG: clang-20 jobs: ci: @@ -41,6 +42,6 @@ jobs: - name: Install CI deps if: runner.os == 'Linux' run: | - sudo apt-get install -y clang llvm + sudo apt-get install -y clang-20 llvm-20 - run: cargo xtask ci diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 682cdf6..dd468d5 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -10,6 +10,7 @@ env: CARGO_PROFILE_RELEASE_LTO: fat CARGO_PROFILE_RELEASE_STRIP: symbols CARGO_BUILD_DEP_INFO_BASEDIR: "." + BOFLINK_TEST_CLANG: clang-20 concurrency: group: "release" @@ -32,7 +33,7 @@ jobs: - name: Install system packages run: | sudo apt-get update -y - sudo apt-get install -y musl musl-dev musl-tools gcc-aarch64-linux-gnu libc6-arm64-cross clang llvm + sudo apt-get install -y musl musl-dev musl-tools gcc-aarch64-linux-gnu libc6-arm64-cross clang-20 llvm-20 - name: Install rust targets run: rustup target add x86_64-unknown-linux-gnu x86_64-unknown-linux-musl aarch64-unknown-linux-gnu diff --git a/tests/utils/tools.rs b/tests/utils/tools.rs index 711d915..a4ed143 100644 --- a/tests/utils/tools.rs +++ b/tests/utils/tools.rs @@ -21,7 +21,7 @@ pub struct Clang { impl std::default::Default for Clang { fn default() -> Self { Self { - exe: "clang".into(), + exe: option_env!("BOFLINK_TEST_CLANG").unwrap_or("clang").into(), #[cfg(windows)] target: "x86_64-pc-windows-msvc".into(), #[cfg(not(windows))] @@ -149,7 +149,9 @@ pub struct Dlltool { impl std::default::Default for Dlltool { fn default() -> Self { Self { - exe: "llvm-dlltool".into(), + exe: option_env!("BOFLINK_TEST_DLLTOOL") + .unwrap_or("llvm-dlltool") + .into(), machine: "i386:x86-64".into(), dllname: String::new(), deffile: PathBuf::new(),