Merge 27fda55 into fea525e

.github/workflows/release.yml

@@ -1,6 +1,9 @@
 name: Release
 
 on:
+  pull_request:
+    branches:
+      - main
   schedule:
     - cron: "0 0 * * *"
   workflow_dispatch:
@@ -121,35 +124,16 @@ jobs:
 
       - name: Install required Rust targets
         run: rustup target add ${{ matrix.target }}
+
+      - name: Install cross v0.2.5 from source
+        run: cargo install cross --git https://github.com/cross-rs/cross --tag v0.2.5
 
       - uses: Swatinem/rust-cache@v2
         with:
           key: ${{ matrix.target }}
           cache-on-failure: true
 
-      - name: Apple M1 setup
-        if: matrix.target == 'aarch64-apple-darwin'
-        run: |
-          brew install make
-          echo "PATH=/usr/local/opt/make/libexec/gnubin:$PATH" >> $GITHUB_ENV
-          echo "SDKROOT=$(xcrun -sdk macosx --show-sdk-path)" >> $GITHUB_ENV
-          echo "MACOSX_DEPLOYMENT_TARGET=$(xcrun -sdk macosx --show-sdk-platform-version)" >> $GITHUB_ENV
-
-      - name: Apple Darwin
-        if: matrix.target == 'x86_64-apple-darwin'
-        run: |
-          brew install make
-          echo "PATH=/usr/local/opt/make/libexec/gnubin:$PATH" >> $GITHUB_ENV
-
-      - name: Linux ARM setup
-        if: matrix.target == 'aarch64-unknown-linux-gnu'
-        run: |
-          sudo apt-get update -y
-          sudo apt-get install -y gcc-aarch64-linux-gnu g++-aarch64-linux-gnu libssl-dev
-          echo "CARGO_TARGET_AARCH64_UNKNOWN_LINUX_GNU_LINKER=aarch64-linux-gnu-gcc" >> $GITHUB_ENV
-          echo "C_INCLUDE_PATH=/usr/aarch64-linux-gnu/include" >> $GITHUB_ENV
-          echo "CPLUS_INCLUDE_PATH=/usr/aarch64-linux-gnu/include" >> $GITHUB_ENV
-
+      # We diverge from upstream and build with cross as we're building static binaries
       - name: Build binaries
         env:
           SVM_TARGET_PLATFORM: ${{ matrix.svm_target_platform }}
@@ -165,7 +149,7 @@ jobs:
           #     flags+=(--features asm-keccak)
           # fi
 
-          RUSTFLAGS='-C target-feature=+crt-static' cargo build --release --bin forge --bin cast --target "$target" "${flags[@]}"
+          RUSTFLAGS='-C target-feature=+crt-static' OPENSSL_STATIC=1 cross build --release --bin forge --bin cast --target "$target" "${flags[@]}"
 
           bins=(cast forge)
           for name in "${bins[@]}"; do

Cross.toml

@@ -0,0 +1,34 @@
+[target.x86_64-unknown-linux-gnu]
+image = "ubuntu:24.04"
+pre-build = [
+    "export DEBIAN_FRONTEND=noninteractive",
+    "export TZ=Etc/UTC",
+    "dpkg --add-architecture $CROSS_DEB_ARCH",
+    "apt update -q && apt upgrade -yq",
+    "apt install --assume-yes --no-install-recommends libclang-14-dev clang-14 cmake build-essential pkg-config libssl-dev:$CROSS_DEB_ARCH libsasl2-dev llvm-14-dev gnutls-bin",
+    "apt install -y gcc-11 g++-11",
+    "update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-11 11",
+    "update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-11 11"
+]
+
+[target.aarch64-unknown-linux-gnu]
+pre-build = [
+    "export DEBIAN_FRONTEND=noninteractive",
+    "dpkg --add-architecture $CROSS_DEB_ARCH",
+    "apt-get update -q && apt-get install --assume-yes --no-install-recommends libssl-dev:$CROSS_DEB_ARCH pkg-config",
+]
+
+
+[target.x86_64-apple-darwin]
+image = "macosx-amd64"
+pre-build = [
+    "brew install make",
+]
+
+[target.aarch64-apple-darwin]
+image = "aarch64-apple-darwin"
+pre-build = [
+    "export SDKROOT=$(xcrun -sdk macosx --show-sdk-path)",
+    "export MACOSX_DEPLOYMENT_TARGET=$(xcrun -sdk macosx --show-sdk-platform-version)",
+    "brew install make",
+]