From e50bae6cd273d055bf5cc109012caedeb510351a Mon Sep 17 00:00:00 2001
From: Sven-Hendrik Haase <svenstaro@gmail.com>
Date: Sun, 2 Jun 2024 15:49:01 +0200
Subject: [PATCH 1/3] Get rid of deprecation warnings

---
 .github/workflows/build-release.yml | 21 +++------------------
 1 file changed, 3 insertions(+), 18 deletions(-)

diff --git a/.github/workflows/build-release.yml b/.github/workflows/build-release.yml
index 0d5f12ef..88010cc6 100644
--- a/.github/workflows/build-release.yml
+++ b/.github/workflows/build-release.yml
@@ -49,24 +49,9 @@ jobs:
         uses: actions/checkout@v4
 
       - name: Setup Rust toolchain
-        uses: actions-rs/toolchain@v1
-        with:
-          toolchain: stable
-          target: ${{ matrix.target }}
-          override: true
-
-      - uses: actions-rs/install@v0.1
-        with:
-          crate: trunk
-          version: latest
-          use-tool-cache: true
-        if: matrix.target == 'wasm32-unknown-unknown'
+        uses: dtolnay/rust-toolchain@stable
 
-      - uses: actions-rs/install@v0.1
-        with:
-          crate: wasm-bindgen-cli
-          version: latest
-          use-tool-cache: true
+      - run: cargo install trunk wasm-bindgen-cli
         if: matrix.target == 'wasm32-unknown-unknown'
 
       - run: sudo apt install musl-tools
@@ -91,7 +76,7 @@ jobs:
       - name: Compress binaries
         uses: svenstaro/upx-action@v2
         with:
-          file: target/${{ matrix.target }}/release/genact${{ env.EXE }}
+          files: target/${{ matrix.target }}/release/genact${{ env.EXE }}
           args: --best --lzma
           strip: false  # We're stripping already in Cargo.toml
         if: matrix.target != 'wasm32-unknown-unknown' && matrix.target != 'x86_64-unknown-freebsd'

From 2a32cadf4fe88631305de6479cbb675c58ac782a Mon Sep 17 00:00:00 2001
From: Sven-Hendrik Haase <svenstaro@gmail.com>
Date: Sun, 2 Jun 2024 17:38:29 +0200
Subject: [PATCH 2/3] Try to fix CI

---
 .github/dependabot.yml              | 2 +-
 .github/workflows/build-release.yml | 7 +++----
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index a65a6607..d496cb50 100644
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -5,6 +5,6 @@ updates:
     schedule:
       interval: monthly
     groups:
-      all-depenencies:
+      all-dependencies:
         patterns:
           - "*"
diff --git a/.github/workflows/build-release.yml b/.github/workflows/build-release.yml
index 88010cc6..a95502f5 100644
--- a/.github/workflows/build-release.yml
+++ b/.github/workflows/build-release.yml
@@ -58,12 +58,11 @@ jobs:
         if: startsWith(matrix.os, 'ubuntu') && matrix.target != 'wasm32-unknown-unknown'
 
       - name: cargo build
-        uses: actions-rs/cargo@v1
+        uses: houseabsolute/actions-rust-cross@v0
         with:
           command: build
-          args: --release --locked --target=${{ matrix.target }}
-          use-cross: ${{ matrix.cross }}
-        if: matrix.target != 'wasm32-unknown-unknown'
+          args: --release --locked ${{ matrix.cargo_flags }}
+          target: ${{ matrix.target }}
 
       - name: trunk build
         run: trunk build --release

From 9c931a9d3b58c7304a9c3151df9d07203a0cda16 Mon Sep 17 00:00:00 2001
From: Sven-Hendrik Haase <svenstaro@gmail.com>
Date: Sun, 2 Jun 2024 17:54:48 +0200
Subject: [PATCH 3/3] Disable UPX on Darwin

It simply doesn't work on OSX.
---
 .github/workflows/build-release.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build-release.yml b/.github/workflows/build-release.yml
index a95502f5..b4da7015 100644
--- a/.github/workflows/build-release.yml
+++ b/.github/workflows/build-release.yml
@@ -78,7 +78,7 @@ jobs:
           files: target/${{ matrix.target }}/release/genact${{ env.EXE }}
           args: --best --lzma
           strip: false  # We're stripping already in Cargo.toml
-        if: matrix.target != 'wasm32-unknown-unknown' && matrix.target != 'x86_64-unknown-freebsd'
+        if: matrix.target != 'wasm32-unknown-unknown' && matrix.target != 'x86_64-unknown-freebsd' && matrix.target != 'x86_64-apple-darwin'
 
       - name: Upload artifact
         uses: actions/upload-artifact@v4