make more work

BoundaryML · Jul 3, 2024 · cbd9b2a · cbd9b2a
1 parent 4ee57e4
commit cbd9b2a
Showing 1 changed file with 16 additions and 23 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -111,6 +111,7 @@ jobs:
           - target: aarch64-unknown-linux-gnu
             host: ubuntu-latest
             # from https://github.com/PyO3/maturin-action?tab=readme-ov-file#manylinux-docker-container
+            # need a new version of manylinux to build crates on arm64-linux
             container: ghcr.io/rust-cross/manylinux_2_28-cross:aarch64	
             node_build: pnpm build --target aarch64-unknown-linux-gnu --use-napi-cross
 
@@ -125,14 +126,15 @@ jobs:
           - target: x86_64-unknown-linux-gnu
             host: ubuntu-latest
             # from https://github.com/PyO3/maturin-action?tab=readme-ov-file#manylinux-docker-container
-            container: quay.io/pypa/manylinux_2_28_x86_64:latest	
-            setup-run: |
-              if command -v yum &> /dev/null; then
-                  yum update -y && yum install -y perl-core openssl openssl-devel pkgconfig libatomic
-              else
-                  # If we're running on debian-based system.
-                  apt update -y && apt-get install -y libssl-dev openssl pkg-config
-              fi
+            # using manylinux-2-28 breaks a bunch of stuff, surprisingly
+            container: quay.io/pypa/manylinux2014_x86_64:latest	
+            # setup-run: |
+            #   if command -v yum &> /dev/null; then
+            #       yum update -y && yum install -y perl-core openssl openssl-devel pkgconfig libatomic
+            #   else
+            #       # If we're running on debian-based system.
+            #       apt update -y && apt-get install -y libssl-dev openssl pkg-config
+            #   fi
             node_build: pnpm build --target x86_64-unknown-linux-gnu --use-napi-cross
 
     name: Build ${{ matrix._.target }}
@@ -163,13 +165,7 @@ jobs:
           targets: ${{ matrix._.target }}
 
       - run: ${{ matrix._.setup-run }}
-          # before-script-linux: |
-          #   if command -v yum &> /dev/null; then
-          #       yum update -y && yum install -y perl-core openssl openssl-devel pkgconfig libatomic
-          #   else
-          #       # If we're running on debian-based system.
-          #       apt update -y && apt-get install -y libssl-dev openssl pkg-config
-          #   fi
+
       # Install steps
       - name: PNPM Install
         run: pnpm install --frozen-lockfile
@@ -178,14 +174,11 @@ jobs:
       - uses: Swatinem/rust-cache@v2
         with:
           workspaces: engine
-      # - name: Install aarch64-linux-gnu
-      #   if: matrix._.target == 'aarch64-unknown-linux-gnu'
-      #   run: sudo apt-get install gcc-aarch64-linux-gnu -y
-
-      # This doesn't work aarch64, so we build each target separately
-      # - name: Build Rust
-      #   run: cargo build --release --target ${{ matrix._.target }}
-      #   working-directory: engine
+          shared-key: engine-release-rust-build-${{ matrix._.target }}
+
+      - name: Build Rust
+        run: cargo build --release --target ${{ matrix._.target }}
+        working-directory: engine
 
       # Build Node
       - name: PNPM Build