From f8bbe5f281aed7c29f09894f55774ec2044933b6 Mon Sep 17 00:00:00 2001
From: Will Jones <willjones127@gmail.com>
Date: Wed, 24 May 2023 20:54:47 -0700
Subject: [PATCH] try manylinux again

---
 .github/workflows/release.yml | 51 ++++++++++++++++++++++++-----------
 Cross.toml                    |  3 +--
 2 files changed, 37 insertions(+), 17 deletions(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 8d393ada..81832868 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -120,35 +120,56 @@ jobs:
         files: node/dist/vectordb-darwin*.tgz
 
   node-linux:
+    name: Linux ${{ matrix.settings.arch}} native node module
     runs-on: ubuntu-latest
     needs: draft-release
     strategy:
       fail-fast: false
       matrix:
-        target:
-          - x86_64-unknown-linux-gnu
-          # TODO: get release working for these targets
-          # - aarch64-unknown-linux-gnu
-          # - aarch64-unknown-linux-musl
-          # - x86_64-unknown-linux-musl
+        libc:
+          - gnu
+          - musl
+        settings:
+          - container: quay.io/pypa/manylinux2014_x86_64
+            arch: x86_64
+            protoc_arch: x86_64
+          - container:  quay.io/pypa/manylinux2014_aarch64
+            arch: aarch64
+            protoc_arch: aarch_64
+    container:
+      image: ${{ matrix.settings.container }}
+      options: --platform linux/amd64
+    defaults:
+      run:
+        shell: bash
+        working-directory: node
     steps:
     - name: Checkout
       uses: actions/checkout@v2
+    - name: Install system dependencies
+      run: |
+        yum install -y openssl-devel unzip
+        # Install new enough protobuf (yum-provided is old)
+        PB_REL=https://github.com/protocolbuffers/protobuf/releases
+        PB_VERSION=23.1
+        curl -LO $PB_REL/download/v$PB_VERSION/protoc-$PB_VERSION-linux-${{ matrix.settings.protoc_arch }}.zip
+        unzip protoc-$PB_VERSION-linux-${{ matrix.settings.protoc_arch }}.zip -d /usr/local
+    - uses: actions/setup-node@v3
+      with:
+        node-version: 18
     - name: Setup Rust
       uses: ATiltedTree/setup-rust@v1
       with:
         rust-version: stable
-    - name: Install system dependencies
-      run: |
-        sudo apt update
-        sudo apt install -y protobuf-compiler libssl-dev
-        cargo install cross
     - name: Install npm dependencies
+      run: npm ci
+    - name: Build ${{ matrix.settings.libc }} library
       run: |
-        cd node
-        npm ci
-    - name: Build Linux native node modules
-      run: bash ci/build_linux_artifacts.sh ${{ matrix.target }}
+        BUILD_TARGET=${{ matrix.settings.arch }}-unknown-linux-${{ matrix.settings.libc }}
+        rustup target add $BUILD_TARGET
+        export RUSTFLAGS="-C target-feature=-crt-static" # for musl
+        npm run build-release -- --target $BUILD_TARGET
+        npm run pack-build -- --target $BUILD_TARGET
     - uses: softprops/action-gh-release@v1
       with:
         draft: true
diff --git a/Cross.toml b/Cross.toml
index 0ee2864f..e9396965 100644
--- a/Cross.toml
+++ b/Cross.toml
@@ -2,8 +2,7 @@
 [target.x86_64-unknown-linux-gnu]
 pre-build = [
     # Install newer gfortran
-    "yum install -y centos-release-scl",
-    "yum install -y openssl-devel unzip devtoolset-11-gcc-gfortran",
+    "yum install -y openssl-devel unzip gcc-gfortran",
     "scl enable devtoolset-11 bash",
     # protobuf is too old, so we directly download binaries
     "PB_REL=https://github.com/protocolbuffers/protobuf/releases",