fixes for action

.github/workflows/release.yml

@@ -120,58 +120,34 @@ 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:
-        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
+        target:
+          - x86_64-unknown-linux-gnu
+          - aarch64-unknown-linux-gnu
+          - aarch64-unknown-linux-musl
+          - x86_64-unknown-linux-musl
     steps:
     - name: Checkout
       uses: actions/checkout@v2
+    - name: Setup Rust
+      uses: ATiltedTree/setup-rust@v1
+      with:
+        rust-version: stable
     - 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
-    - name: Install Node
-      run: |
-        curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.34.0/install.sh | bash
-        source "$HOME"/.nvm/nvm.sh
-        nvm install 17 # latest that supports glibc 2.17
-    - name: Setup Rust
-      run: |
-        curl https://sh.rustup.rs -sSf | bash -s -- -y
-        echo "/root/.cargo/bin" >> $GITHUB_PATH
+        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: |
-        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
+        cd node
+        npm ci
+    - name: Build Linux native node modules
+      run: bash ci/build_linux_artifacts.sh ${{ matrix.target }}
     - uses: softprops/action-gh-release@v1
       with:
         draft: true

Cross.toml

@@ -1,39 +1,26 @@
 # These make sure our builds are compatible with old glibc versions.
 [target.x86_64-unknown-linux-gnu]
 pre-build = [
-    # Install newer 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",
-    "PB_VERSION=23.1",
-    "curl -LO $PB_REL/download/v$PB_VERSION/protoc-$PB_VERSION-linux-x86_64.zip",
-    "unzip protoc-$PB_VERSION-linux-x86_64.zip -d /usr/local",
+    "dpkg --add-architecture $CROSS_DEB_ARCH",
+    "apt-get update && apt-get install --assume-yes libssl-dev:$CROSS_DEB_ARCH protobuf-compiler:$CROSS_DEB_ARCH",
 ]
 image = "ghcr.io/cross-rs/x86_64-unknown-linux-gnu:main-centos"
 
 [target.aarch64-unknown-linux-gnu]
 pre-build = [
-    "yum install -y openssl-devel unzip",
-    # protobuf is too old, so we directly download binaries
-    "PB_REL=https://github.com/protocolbuffers/protobuf/releases",
-    "PB_VERSION=23.1",
-    "curl -LO $PB_REL/download/v$PB_VERSION/protoc-$PB_VERSION-linux-x86_64.zip",
-    "unzip protoc-$PB_VERSION-linux-x86_64.zip -d /usr/local",
+    "dpkg --add-architecture $CROSS_DEB_ARCH",
+    "apt-get update && apt-get install --assume-yes libssl-dev:$CROSS_DEB_ARCH protobuf-compiler:$CROSS_DEB_ARCH",
 ]
-# https://github.com/cross-rs/cross/blob/main/docker/Dockerfile.aarch64-unknown-linux-gnu.centos
 image = "ghcr.io/cross-rs/aarch64-unknown-linux-gnu:main-centos"
 
 [target.x86_64-unknown-linux-musl]
-# https://github.com/cross-rs/cross/blob/main/docker/Dockerfile.x86_64-unknown-linux-musl
 pre-build = [
     "dpkg --add-architecture $CROSS_DEB_ARCH",
-    "apt-get update && apt-get install --assume-yes libssl-dev:$CROSS_DEB_ARCH",
+    "apt-get update && apt-get install --assume-yes libssl-dev:$CROSS_DEB_ARCH protobuf-compiler:$CROSS_DEB_ARCH",
 ]
 
 [target.aarch64-unknown-linux-musl]
-# https://github.com/cross-rs/cross/blob/main/docker/Dockerfile.aarch64-unknown-linux-musl
 pre-build = [
     "dpkg --add-architecture $CROSS_DEB_ARCH",
-    "apt-get update && apt-get install --assume-yes libssl-dev:$CROSS_DEB_ARCH",
+    "apt-get update && apt-get install --assume-yes libssl-dev:$CROSS_DEB_ARCH protobuf-compiler:$CROSS_DEB_ARCH",
 ]