WIP: temporarily commit

pollenjp · Oct 24, 2024 · 886b1d2 · 886b1d2
1 parent df13a92
commit 886b1d2
Showing 1 changed file with 16 additions and 4 deletions.
diff --git a/.github/workflows/build-binaries.yml b/.github/workflows/build-binaries.yml
@@ -19,8 +19,6 @@ env:
   RUSTUP_MAX_RETRIES: 10
   FETCH_DEPTH: 0 # pull in the tags for the version string
   MACOSX_DEPLOYMENT_TARGET: 13.0
-  # https://blog.rust-lang.org/2022/08/01/Increasing-glibc-kernel-requirements.html
-  BUILD_GLIB_VERSION: 2.17
 
 jobs:
   dist:
@@ -37,8 +35,11 @@ jobs:
           #   code-target: win32-arm64
           - os: ubuntu-20.04
             target: x86_64-unknown-linux-gnu
+            # https://blog.rust-lang.org/2022/08/01/Increasing-glibc-kernel-requirements.html
+            glib_version: 2.17
           # - os: ubuntu-20.04
           #   target: aarch64-unknown-linux-gnu
+          #   glib_version: 2.17
           # - os: ubuntu-20.04
           #   target: arm-unknown-linux-gnueabihf
           # - os: macos-13
@@ -60,6 +61,11 @@ jobs:
             echo CARGO_HOME="${{ runner.temp }}/.cargo"
             echo PYTHONUSERBASE="${{ runner.temp }}/.local"
           } >> "$GITHUB_ENV"
+      - name: Debug
+        run: |
+          set +e
+          ls -la ~/.rustup
+          ls -la ~/.cargo
       - name: Install Rust
         run: |
           curl --proto '=https' --tlsv1.2 --retry 10 --retry-connrefused -fsSL "https://sh.rustup.rs" \
@@ -77,6 +83,8 @@ jobs:
           rustup update --no-self-update stable
           rustup target add ${{ matrix.target }}
           rustup component add rust-src
+      - name: Install cargo-zigbuild
+        run: cargo install --locked cargo-zigbuild
       - name: Checkout repository
         uses: actions/checkout@v4
         with:
@@ -87,8 +95,12 @@ jobs:
           ls -la ~/.rustup
           ls -la ~/.cargo
       - name: Dist
-        run: cargo xtask dist --client-patch-version ${{ github.run_number }}
-
+        run: |
+          target="${{ matrix.target }}"
+          if [[ -n "${{ matrix.target.glib_version }}" ]]; then
+            target="${target}.${{ matrix.target.glib_version }}"
+          fi
+          cargo zigbuild --target="${target}"
       - name: Upload artifacts
         uses: actions/upload-artifact@v4
         with: