From 505eed6ea52ca5bf2cd1261915c8795531c72a8a Mon Sep 17 00:00:00 2001
From: John Doty <john@d0ty.me>
Date: Fri, 20 Jan 2023 13:18:51 -0800
Subject: [PATCH] More stuff; use the cross compiler and stuff

---
 .github/workflows/release.yaml | 37 +++++++++++++++++++++++++++++-----
 Cargo.lock                     |  2 +-
 2 files changed, 33 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
index 8e38bb0..ad64bc5 100644
--- a/.github/workflows/release.yaml
+++ b/.github/workflows/release.yaml
@@ -87,19 +87,46 @@ jobs:
         toolchain: ${{ matrix.rust }}
         target: ${{ matrix.target }}
 
+    - name: Use Cross
+      shell: bash
+      run: |
+        cargo install cross
+        echo "CARGO=cross" >> $GITHUB_ENV
+        echo "TARGET_FLAGS=--target ${{ matrix.target }}" >> $GITHUB_ENV
+        echo "TARGET_DIR=./target/${{ matrix.target }}" >> $GITHUB_ENV
+
     - name: Build release binary
       run: ${{ env.CARGO }} build --verbose --release ${{ env.TARGET_FLAGS }}
 
     - name: Strip release binary (linux and macos)
       if: matrix.build == 'linux' || matrix.build == 'macos'
-      run: strip "target/${{ matrix.target }}/release/fwd"
+      run: |
+        strip "target/${{ matrix.target }}/release/fwd"
+        strip "target/${{ matrix.target }}/release/fwd-browse"
 
-    - name: Upload release assets
-      uses: actions/upload-release-asset@v1
+    - name: Build archive
+      shell: bash
+      run: |
+        staging="fwd-${{ needs.create-release.outputs.fwd_version }}-${{ matrix.target }}"
+        mkdir -p "$staging"
+
+        if [ "${{ matrix.os }}" = "windows-2022" ]; then
+          cp "target/${{ matrix.target }}/release/fwd.exe" "$staging/"
+          7z a "$staging.zip" "$staging"
+          echo "ASSET=$staging.zip" >> $GITHUB_ENV
+        else
+          cp "target/${{ matrix.target }}/release/fwd" "$staging/"
+          cp "target/${{ matrix.target }}/release/fwd-browse" "$staging/"
+          tar czf "$staging.tar.gz" "$staging"
+          echo "ASSET=$staging.tar.gz" >> $GITHUB_ENV
+        fi
+
+    - name: Upload release archive
+      uses: actions/upload-release-asset@v1.0.2
       env:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       with:
         upload_url: ${{ needs.create_release.outputs.upload_url }}
-        asset_name: fwd-${{needs.create_release.outputs.fwd_version }}-${{ matrix.target }}
-        asset_path: "./target/${{ matrix.target }}/release/fwd"
+        asset_name: ${{ env.ASSET }}
+        asset_path: ${{ env.ASSET }}
         asset_content_type: application/octet-stream
diff --git a/Cargo.lock b/Cargo.lock
index f46287c..1f75841 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -249,7 +249,7 @@ checksum = "04909a7a7e4633ae6c4a9ab280aeb86da1236243a77b694a49eacd659a4bd3ac"
 
 [[package]]
 name = "fwd"
-version = "0.2.0"
+version = "0.3.0"
 dependencies = [
  "anyhow",
  "assert_matches",