fix: revert cargo-zigbuild (yetone#664)

* Revert "fix(release): install openssl headers (yetone#662)" This reverts commit 6aaaeda. * Revert "fix(release): setup zig for cargo-zigbuild (yetone#661)" This reverts commit e3e5785. * Revert "feat(release): use cargo-zigbuild to build for glibc 2.17 (yetone#660)" This reverts commit 2ff2456.
Hein00 · Sep 28, 2024 · d28fece · d28fece
1 parent 6aaaeda
commit d28fece
Showing 1 changed file with 15 additions and 20 deletions.
diff --git 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' }}
-        run: |
-          sudo apt-get install -y pkg-config libssl-dev
-
-      - name: Build all crates with glibc 2.17
-        if: ${{ matrix.config.os_name == 'linux' }}
+      - name: Build all crates with glibc 2.17 # for glibc 2.17
+        if: ${{ matrix.config.container != null }}
         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' }}