Compare commits

..

1 Commits

Author SHA1 Message Date
Will Jones
6c19047f28 fixes for action 2023-05-23 19:41:01 -07:00
3 changed files with 11 additions and 36 deletions

View File

@@ -82,6 +82,7 @@ jobs:
node-version: 20 node-version: 20
cache: 'npm' cache: 'npm'
cache-dependency-path: node/package-lock.json cache-dependency-path: node/package-lock.json
- uses: Swatinem/rust-cache@v2
- name: Install dependencies - name: Install dependencies
run: | run: |
sudo apt update sudo apt update
@@ -100,7 +101,6 @@ jobs:
runs-on: macos-12 runs-on: macos-12
needs: draft-release needs: draft-release
strategy: strategy:
fail-fast: false
matrix: matrix:
target: [x86_64-apple-darwin, aarch64-apple-darwin] target: [x86_64-apple-darwin, aarch64-apple-darwin]
steps: steps:
@@ -123,20 +123,15 @@ jobs:
runs-on: ubuntu-latest runs-on: ubuntu-latest
needs: draft-release needs: draft-release
strategy: strategy:
fail-fast: false
matrix: matrix:
target: target:
- x86_64-unknown-linux-gnu - x86_64-unknown-linux-gnu:centos
- aarch64-unknown-linux-gnu - aarch64-unknown-linux-gnu:centos
- aarch64-unknown-linux-musl - aarch64-unknown-linux-musl
- x86_64-unknown-linux-musl - x86_64-unknown-linux-musl
steps: steps:
- name: Checkout - name: Checkout
uses: actions/checkout@v2 uses: actions/checkout@v2
- name: Setup Rust
uses: ATiltedTree/setup-rust@v1
with:
rust-version: stable
- name: Install system dependencies - name: Install system dependencies
run: | run: |
sudo apt update sudo apt update

View File

@@ -1,34 +1,14 @@
# These make sure our builds are compatible with old glibc versions. # These make sure our builds are compatible with old glibc versions.
[target.x86_64-unknown-linux-gnu] [target.x86_64-unknown-linux-gnu]
pre-build = [ 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",
] ]
image = "ghcr.io/cross-rs/x86_64-unknown-linux-gnu:main-centos" image = "ghcr.io/cross-rs/x86_64-unknown-linux-gnu:main-centos"
[target.aarch64-unknown-linux-gnu] [target.aarch64-unknown-linux-gnu]
pre-build = [ 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",
] ]
image = "ghcr.io/cross-rs/aarch64-unknown-linux-gnu:main-centos" image = "ghcr.io/cross-rs/aarch64-unknown-linux-gnu:main-centos"
[target.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]
pre-build = [
"dpkg --add-architecture $CROSS_DEB_ARCH",
"apt-get update && apt-get install --assume-yes libssl-dev:$CROSS_DEB_ARCH",
]

View File

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