diff --git a/.github/workflows/release-build.yml b/.github/workflows/release-build.yml index 45f78f22..142d9ef0 100644 --- a/.github/workflows/release-build.yml +++ b/.github/workflows/release-build.yml @@ -19,16 +19,16 @@ jobs: fail-fast: false matrix: include: - - { o: macos-latest, t: x86_64-apple-darwin, r: true } - - { o: macos-latest, t: aarch64-apple-darwin } - - { o: ubuntu-20.04, t: x86_64-unknown-linux-gnu, r: true } - - { o: ubuntu-20.04, t: armv7-unknown-linux-gnueabihf, c: true } - - { o: ubuntu-20.04, t: aarch64-unknown-linux-gnu } - - { o: ubuntu-latest, t: x86_64-unknown-linux-musl, r: true } - - { o: ubuntu-latest, t: armv7-unknown-linux-musleabihf, c: true } - - { o: ubuntu-latest, t: aarch64-unknown-linux-musl, c: true } - - { o: windows-latest, t: x86_64-pc-windows-msvc, r: true } - - { o: windows-latest, t: aarch64-pc-windows-msvc } + - { o: macos-latest, t: x86_64-apple-darwin, r: true } + - { o: macos-latest, t: aarch64-apple-darwin } + - { o: ubuntu-20.04, t: x86_64-unknown-linux-gnu, r: true } + - { o: ubuntu-20.04, t: armv7-unknown-linux-gnueabihf, c: true } + - { o: ubuntu-20.04, t: aarch64-unknown-linux-gnu, c: true } + - { o: ubuntu-latest, t: x86_64-unknown-linux-musl, r: true, c: true } + - { o: ubuntu-latest, t: armv7-unknown-linux-musleabihf, c: true } + - { o: ubuntu-latest, t: aarch64-unknown-linux-musl, c: true } + - { o: windows-latest, t: x86_64-pc-windows-msvc, r: true } + - { o: windows-latest, t: aarch64-pc-windows-msvc } name: ${{ matrix.t }} runs-on: ${{ matrix.o }} diff --git a/justfile b/justfile index 2ef052b6..bc95db81 100644 --- a/justfile +++ b/justfile @@ -105,8 +105,6 @@ export RUSTFLAGS := "-Z share-generics " + (rustc-gcclibs) + (rustc-miropt) + (r # libblocksruntime-dev provides compiler-rt ci-apt-deps := if target == "x86_64-unknown-linux-gnu" { "liblzma-dev libzip-dev libzstd-dev" - } else if target == "x86_64-unknown-linux-musl" { "musl-tools" - } else if target == "aarch64-unknown-linux-gnu" { "g++-aarch64-linux-gnu libc6-dev-arm64-cross binutils binutils-aarch64-linux-gnu libblocksruntime-dev" } else { "" } [linux]