ci/release: Fix broken cross-compilation setup (#100)

Changes in the ecosystem since last release
have broken the cross-compilation setup.
Fix it again, use the 'cross' tool to cross-compile.

Unfortunately, it seems that the musl build for Linux ARM64 doesn't work
anymore
so switching back to gnu for that target.

Author: abhinav

.changes/unreleased/Changed-20240802-071633.yaml

@@ -0,0 +1,3 @@
+kind: Changed
+body: 'linux-arm64: Binary is no longer statically linked.'
+time: 2024-08-02T07:16:33.678855-07:00

.github/workflows/release.yml

@@ -24,22 +24,18 @@ jobs:
           - slug: linux-amd64
             target: x86_64-unknown-linux-musl
             os: ubuntu-latest
-            extra_pkgs: musl-tools
+            strip: x86_64-linux-musl-strip
 
           - slug: linux-arm64
-            target: aarch64-unknown-linux-musl
+            target: aarch64-unknown-linux-gnu
             os: ubuntu-latest
-            linker: aarch64-linux-musl-gcc
-            musl-cross: aarch64-linux-musl-cross
-            strip: aarch64-linux-musl-strip
+            strip: aarch64-linux-gnu-strip
             no-build-std: true
 
           - slug: linux-armv7
             target: armv7-unknown-linux-musleabihf
             os: ubuntu-latest
-            linker: armv7l-linux-musleabihf-gcc
-            musl-cross: armv7l-linux-musleabihf-cross
-            strip: armv7l-linux-musleabihf-strip
+            strip: arm-linux-musleabihf-strip
             no-build-std: true
 
           # macOS
@@ -50,6 +46,10 @@ jobs:
             target: aarch64-apple-darwin
             os: macos-latest
 
+    env:
+      CARGO: cargo
+      CROSS_VERSION: v0.2.5
+
     steps:
 
     - name: Checkout code
@@ -74,33 +74,21 @@ jobs:
           --no-self-update
     - uses: Swatinem/rust-cache@v2
 
-    - name: Install extra packages
-      if: ${{ matrix.os == 'ubuntu-latest' && matrix.extra_pkgs != '' }}
-      run: |
-        sudo apt-get update
-        sudo apt-get install -y ${{ matrix.extra_pkgs }}
-
-    - name: Install musl cross-compilation toolchain
-      if: ${{ matrix.os == 'ubuntu-latest' && matrix.musl-cross != '' }}
+    - name: Install Cross
+      if: matrix.os == 'ubuntu-latest' && matrix.target != ''
       run: |
-        mkdir -p "$HOME/.local"
-        curl -o /tmp/musl.tgz https://musl.cc/${{ matrix.musl-cross }}.tgz
-        tar -xzf /tmp/musl.tgz -C "$HOME/.local"
-        echo "$HOME/.local/${{ matrix.musl-cross }}/bin" >> "$GITHUB_PATH"
-
-    - name: Configure linker
-      if: ${{ matrix.os == 'ubuntu-latest' && matrix.linker != '' }}
-      run: |
-        mkdir -p .cargo
-        cat > .cargo/config.toml <<EOF
-        [target.${{ matrix.target }}]
-        linker = "${{ matrix.linker }}"
-        EOF
+        dir="$RUNNER_TEMP/cross-download"
+        mkdir "$dir"
+        echo "$dir" >> "$GITHUB_PATH"
+        cd "$dir"
+        curl -LO "https://github.com/cross-rs/cross/releases/download/$CROSS_VERSION/cross-x86_64-unknown-linux-musl.tar.gz"
+        tar xf cross-x86_64-unknown-linux-musl.tar.gz
+        echo "CARGO=cross" >> "$GITHUB_ENV"
 
     - name: Build (build-std)
       if: ${{ !matrix.no-build-std }}
       run: |
-        cargo build \
+        ${{ env.CARGO }} build \
           --target ${{ matrix.target }} \
           --locked \
           --release \
@@ -110,19 +98,30 @@ jobs:
     - name: Build (no-build-std)
       if: ${{ matrix.no-build-std }}
       run: |
-        cargo build \
+        ${{ env.CARGO }} build \
           --target ${{ matrix.target }} \
           --locked \
           --release
 
-    - name: Strip binary
+    - name: Strip release binary (macos)
+      if: matrix.os == 'macos-latest'
       run: |
         strip=${{ matrix.strip || 'strip' }}
         exe=target/${{ matrix.target }}/release/restack
         echo "Before: $(wc -c < "$exe") bytes"
         "$strip" target/${{ matrix.target }}/release/restack
         echo "After: $(wc -c < "$exe") bytes"
 
+    - name: Strip release binary (cross)
+      if: env.CARGO == 'cross'
+      shell: bash
+      run: |
+        docker run --rm -v \
+          "$PWD/target:/target:Z" \
+          "ghcr.io/cross-rs/${{ matrix.target }}:main" \
+          "${{ matrix.strip }}" \
+          "/target/${{ matrix.target }}/release/restack"
+
     - name: Prepare archive
       run: |
         tar -cvzf restack-${{ matrix.slug }}.tar.gz \
@@ -132,7 +131,7 @@ jobs:
     - name: Upload archive
       uses: actions/upload-artifact@v4
       with:
-        name: restack-archive
+        name: restack-${{ matrix.slug }}
         path: restack-*.tar.gz
 
   release:
@@ -169,7 +168,9 @@ jobs:
     - name: Download archives
       uses: actions/download-artifact@v4
       with:
-        name: restack-archive
+        path: .
+        pattern: restack-*
+        merge-multiple: true
 
     - name: Determine version number (push)
       if:  github.event_name == 'push' && startsWith(github.ref, 'refs/tags/v')