From 244a19708063b2a436b38428299d9cf4f4df6e25 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Paul=20G=C3=B6tze?= Date: Sun, 26 Nov 2023 11:21:17 +0100 Subject: [PATCH] Drop arm-unknown-linux-gnueabihf as precompiled target due to issues with the target-pointer-width (found 64, needed 32) and hence a failing compilation In order to fix cross-compilation --- .github/workflows/release.yml | 3 ++- CHANGELOG.md | 1 + native/mjml_nif/.cargo/config | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 6404c59..927c42e 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -20,7 +20,6 @@ jobs: matrix: nif: ["2.16", "2.15"] job: - - { target: arm-unknown-linux-gnueabihf , os: ubuntu-22.04 , use-cross: true } - { target: aarch64-unknown-linux-gnu , os: ubuntu-22.04 , use-cross: true } - { target: aarch64-unknown-linux-musl , os: ubuntu-22.04 , use-cross: true } - { target: aarch64-apple-darwin , os: macos-11 } @@ -40,12 +39,14 @@ jobs: run: | # Get the project version from mix.exs echo "PROJECT_VERSION=$(sed -n 's/^ @version "\(.*\)"/\1/p' mix.exs | head -n1)" >> $GITHUB_ENV + - name: Install Rust toolchain uses: dtolnay/rust-toolchain@stable with: toolchain: stable target: ${{ matrix.job.target }} + - name: Build the project id: build-crate uses: philss/rustler-precompiled-action@v1.1.3 diff --git a/CHANGELOG.md b/CHANGELOG.md index f020ba8..add8e2f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -14,6 +14,7 @@ I.e. `mjml_nif 0.x` versions use mrml versions `>= 0.1, < 1.0.0`, and `mjml_nif - Use rustler_precompiled v0.7.0 + drop support for Elixir < v1.12 - Use Rust edition 2021 - Use rustler v0.30.0 +- Drop arm-unknown-linux-gnueabihf as precompiled target --- diff --git a/native/mjml_nif/.cargo/config b/native/mjml_nif/.cargo/config index 6992980..d7493c5 100644 --- a/native/mjml_nif/.cargo/config +++ b/native/mjml_nif/.cargo/config @@ -18,7 +18,7 @@ rustflags = [ [target.arm-unknown-linux-gnueabihf] linker = "arm-linux-gnueabihf-gcc" rustflags = [ - "-l", "dylib=atomic" + "-l", "dylib=atomic", ] # See https://github.com/rust-lang/rust/issues/59302