From 28ba6933f1a00e09b2e4c8f8a581731bb1ff271c Mon Sep 17 00:00:00 2001
From: Wilfred Hughes <me@wilfred.me.uk>
Date: Mon, 4 Sep 2023 11:46:41 -0700
Subject: [PATCH] Use cross for release

---
 .github/workflows/release.yml | 41 ++++++++++++++++++++---------------
 1 file changed, 24 insertions(+), 17 deletions(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 66e7cb8d0e..14921d354b 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -40,27 +40,34 @@ jobs:
             os: ubuntu-20.04
           - target: aarch64-apple-darwin
             os: macos-latest
+
     runs-on: ${{ matrix.os }}
     steps:
       - uses: actions/checkout@v3
-      - uses: taiki-e/upload-rust-binary-action@v1
+
+      - name: Install Rust toolchain
+        uses: dtolnay/rust-toolchain@1.59.0
         with:
-          bin: difft
-          # (optional) On which platform to distribute the `.tar.gz` file.
-          tar: unix
-          # (optional) On which platform to distribute the `.zip` file.
-          zip: windows
-          # (optional) Target triple, default is host triple.
-          target: ${{ matrix.target }}
-        env:
-          # (required)
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          targets: ${{ matrix.job.target }}
 
-  push_crates_io:
-    runs-on: ubuntu-20.04
-    steps:
-      - uses: actions/checkout@v3
-      - uses: katyo/publish-crates@v1
+      - name: Install cross
+        uses: taiki-e/install-action@v2
         with:
-          registry-token: ${{ secrets.CARGO_REGISTRY_TOKEN }}
+          tool: cross
+
+      - name: Do release build
+        shell: bash
+        run: cross build --release
+
+      - name: Move binary to root of checkout
+        shell: bash
+        run: mv target/${{ matrix.job.target }}/release/difft difft
+
+      - name: Compress binary
+        shell: bash
+        run: tar -cvzf difft-${{ matrix.job.target }}.tar.gz difft
 
+      # needs target in file name
+      - name: Upload binary
+        shell: bash
+        run: gh release upload ${{ github.ref }} difft-${{ matrix.job.target }}.tar.gz