From d28fece4725a2c71e18b9157f71f1af6231547bf Mon Sep 17 00:00:00 2001 From: yetone Date: Sun, 29 Sep 2024 02:14:17 +0800 Subject: [PATCH] fix: revert cargo-zigbuild (#664) * Revert "fix(release): install openssl headers (#662)" This reverts commit 6aaaeda003599c7e64492c11e2a63e7c5efaf98a. * Revert "fix(release): setup zig for cargo-zigbuild (#661)" This reverts commit e3e5785a1a9c257083e6f9f86cdb66486a1d6b47. * Revert "feat(release): use cargo-zigbuild to build for glibc 2.17 (#660)" This reverts commit 2ff2456fcb8af8fe8aff36278014d6e42fe6a354. --- .github/workflows/release.yaml | 35 +++++++++++++++------------------- 1 file changed, 15 insertions(+), 20 deletions(-) diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index c355772..8d4f41f 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -56,6 +56,8 @@ jobs: os_name: linux arch: x86_64 rust_target: x86_64-unknown-linux-gnu + docker_platform: linux/amd64 + container: quay.io/pypa/manylinux2014_x86_64 # for glibc 2.17 - os: ubuntu-latest os_name: linux arch: aarch64 @@ -83,35 +85,28 @@ jobs: - uses: actions/checkout@v4 - uses: Swatinem/rust-cache@v2 - + if: ${{ matrix.config.container == null }} - uses: dtolnay/rust-toolchain@master + if: ${{ matrix.config.container == null }} with: targets: ${{ matrix.config.rust_target }} toolchain: 1.80.0 - - - uses: goto-bus-stop/setup-zig@v2 - if: ${{ matrix.config.os_name == 'linux' }} - - - name: Install cargo-zigbuild - if: ${{ matrix.config.os_name == 'linux' }} - uses: baptiste0928/cargo-install@v3 - with: - crate: cargo-zigbuild - - name: Build all crates - if: ${{ matrix.config.os_name != 'linux' }} + if: ${{ matrix.config.container == null }} run: | cargo build --release --features ${{ matrix.feature }} - - name: Install OpenSSL headers - if: ${{ matrix.config.os_name == 'linux' }} + - name: Build all crates with glibc 2.17 # for glibc 2.17 + if: ${{ matrix.config.container != null }} run: | - sudo apt-get install -y pkg-config libssl-dev - - - name: Build all crates with glibc 2.17 - if: ${{ matrix.config.os_name == 'linux' }} - run: | - cargo zigbuild --target ${{ matrix.config.rust_target }}.2.17 --release --features ${{ matrix.feature }} + # sudo apt-get install -y qemu qemu-user-static + docker run \ + --rm \ + -v $(pwd):/workspace \ + -w /workspace \ + --platform ${{ matrix.config.docker_platform }} \ + ${{ matrix.config.container }} \ + bash -c "yum install -y openssl-devel && curl --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --profile minimal && . /root/.cargo/env && cargo build --release --features ${{ matrix.feature }}" - name: Handle binaries if: ${{ matrix.config.os_name != 'windows' }}