diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 892ce4c..5fab243 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -16,9 +16,9 @@ jobs: - name: Set OpenSSL Environment Variables run: | echo "OPENSSL_DIR=/usr" >> $GITHUB_ENV - echo "OPENSSL_LIB_DIR=/usr/lib/x86_64-linux-gnu" >> $GITHUB_ENV + echo "OPENSSL_LIB_DIR=/usr/lib/aarch64-linux-gnu" >> $GITHUB_ENV echo "OPENSSL_INCLUDE_DIR=/usr/include" >> $GITHUB_ENV - echo "PKG_CONFIG_PATH=/usr/lib/x86_64-linux-gnu/pkgconfig" >> $GITHUB_ENV + echo "PKG_CONFIG_PATH=/usr/lib/aarch64-linux-gnu/pkgconfig" >> $GITHUB_ENV - name: Verify OpenSSL Installation and Env Vars run: | @@ -35,13 +35,6 @@ jobs: - name: Install maturin run: pip install maturin - - name: Set OpenSSL Environment Variables - run: | - echo "OPENSSL_DIR=/usr" >> $GITHUB_ENV - echo "OPENSSL_LIB_DIR=/usr/lib/x86_64-linux-gnu" >> $GITHUB_ENV - echo "OPENSSL_INCLUDE_DIR=/usr/include" >> $GITHUB_ENV - echo "PKG_CONFIG_PATH=/usr/lib/x86_64-linux-gnu/pkgconfig" >> $GITHUB_ENV - - name: Install Rust target for ARM64 uses: actions-rs/toolchain@v1 with: @@ -50,27 +43,24 @@ jobs: target: aarch64-unknown-linux-gnu override: true - - name: Install cross-compiling tools and OpenSSL for ARM64 + - name: Install cross-compiling tools for ARM64 run: | sudo apt-get update sudo apt-get install -y gcc-aarch64-linux-gnu g++-aarch64-linux-gnu - sudo apt-get install -y libssl-dev - sudo apt-get install musl-tools clang llvm -y + sudo apt-get install musl-tools - name: Set Environment Variables for ARM64 build run: | - echo "CC_aarch64_unknown_linux_musl=clang" >> $GITHUB_ENV - echo "AR_aarch64_unknown_linux_musl=llvm-ar" >> $GITHUB_ENV - echo "CARGO_TARGET_AARCH64_UNKNOWN_LINUX_MUSL_RUSTFLAGS=-Clink-self-contained=yes -Clinker=rust-lld" >> $GITHUB_ENV + echo "CC_aarch64_unknown_linux_gnu=aarch64-linux-gnu-gcc" >> $GITHUB_ENV + echo "CARGO_TARGET_AARCH64_UNKNOWN_LINUX_GNU_LINKER=aarch64-linux-gnu-gcc" >> $GITHUB_ENV - name: Build arm64 Wheels run: maturin build --release --out dist/arm64 --find-interpreter --target aarch64-unknown-linux-gnu env: CARGO_TERM_COLOR: always CC: aarch64-linux-gnu-gcc - OPENSSL_DIR: /path/to/openssl/for/aarch64 - - + OPENSSL_DIR: /usr + - name: Build amd64 Wheels run: maturin build --release --out dist/amd64 --find-interpreter --target x86_64-unknown-linux-gnu env: