fixes for action

.github/workflows/release.yml

@@ -126,18 +126,13 @@ jobs:
       fail-fast: false
       matrix:
         target:
-          - x86_64-unknown-linux-gnu
+          - x86_64-unknown-linux-gnu:centos
-          # TODO: get release working for these targets
+          - aarch64-unknown-linux-gnu:centos
-          # - aarch64-unknown-linux-gnu
+          - aarch64-unknown-linux-musl
-          # - aarch64-unknown-linux-musl
+          - x86_64-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: |
         sudo apt update

Cross.toml

@@ -1,40 +1,14 @@
 # These make sure our builds are compatible with old glibc versions.
 [target.x86_64-unknown-linux-gnu]
 pre-build = [
-    # Install newer gfortran
+    "dpkg --add-architecture $CROSS_DEB_ARCH",
-    "yum install -y centos-release-scl",
+    "apt-get update && apt-get install --assume-yes libssl-dev:$CROSS_DEB_ARCH protobuf-compiler",
-    "yum install -y openssl-devel unzip devtoolset-11-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",
 ]
 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",
+    "dpkg --add-architecture $CROSS_DEB_ARCH",
-    # protobuf is too old, so we directly download binaries
+    "apt-get update && apt-get install --assume-yes libssl-dev:$CROSS_DEB_ARCH protobuf-compiler",
-    "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",
 ]
-# 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",
-]
-
-[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",
-]

ci/build_linux_artifacts.sh

@@ -21,10 +21,6 @@ build_node_binaries() {
         echo "Building node library for $target"
         # cross doesn't yet pass this down to Docker, so we do it ourselves.
         export CROSS_CONTAINER_OPTS="--platform linux/amd64"
-        if [[ $target == *musl ]]; then
-            # This is needed for cargo to allow build cdylibs with musl
-            RUSTFLAGS="-C target-feature=-crt-static"
-        fi
         npm run cross-release -- --target $target
         npm run pack-build -- --target $target
     done