From bc26cb9b659bcb1dc298e21b110016dafe37a2a3 Mon Sep 17 00:00:00 2001
From: Jonathan Grahl <jonathan@keyholders.io>
Date: Wed, 27 Mar 2024 07:08:02 -0500
Subject: [PATCH 1/4] ci: setup rust target correctly

---
 .github/workflows/release.yaml | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
index 2a01971..7b05234 100644
--- a/.github/workflows/release.yaml
+++ b/.github/workflows/release.yaml
@@ -20,8 +20,6 @@ jobs:
             OS: macos-latest
           - TARGET: aarch64-apple-darwin
             OS: macos-arm-latest
-          - TARGET: x86_64-pc-windows-msvc # tested on a windows machine
-            OS: windows-latest
     name: Create Release ${{ github.event_name == 'pull_request' && '(dry-run)' }}
     runs-on: ubuntu-22.04
     env:
@@ -50,6 +48,8 @@ jobs:
 
       - name: Setup Rust
         uses: actions-rust-lang/setup-rust-toolchain@v1
+        with:
+          target: $TARGET
 
       - name: Generate the artifacts
         run: cargo build --release --target $TARGET
@@ -57,12 +57,7 @@ jobs:
       - name: Move files
         run: |
           mkdir -p ./artifacts
-          if [[ $OS =~ ^windows.*$ ]]; then
-              EXEC=molnctl.exe
-          else
-              EXEC=molnctl
-          fi
-          mv ./target/$TARGET/release/$EXEC ./artifacts
+          mv ./target/$TARGET/release/molnctl ./artifacts/molnctl-$TARGET
 
       - name: Create Release
         if: github.event_name == 'push'

From 3575b969a7db8be22881a68c7776846f478d6e87 Mon Sep 17 00:00:00 2001
From: Jonathan Grahl <jonathan@keyholders.io>
Date: Wed, 27 Mar 2024 07:25:09 -0500
Subject: [PATCH 2/4] run on correct os

---
 .github/workflows/release.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
index 7b05234..1c6f4c3 100644
--- a/.github/workflows/release.yaml
+++ b/.github/workflows/release.yaml
@@ -21,7 +21,7 @@ jobs:
           - TARGET: aarch64-apple-darwin
             OS: macos-arm-latest
     name: Create Release ${{ github.event_name == 'pull_request' && '(dry-run)' }}
-    runs-on: ubuntu-22.04
+    runs-on: ${{ matrix.OS }}
     env:
       TARGET: ${{ matrix.TARGET }}
       OS: ${{ matrix.OS }}

From 72eaecb701abc3991767dc032ffbbdad8006af00 Mon Sep 17 00:00:00 2001
From: Jonathan Grahl <jonathan@keyholders.io>
Date: Wed, 27 Mar 2024 07:38:06 -0500
Subject: [PATCH 3/4] ci: build aarch64 darwin on macos-14-arm

---
 .github/workflows/release.yaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
index 1c6f4c3..4e390f4 100644
--- a/.github/workflows/release.yaml
+++ b/.github/workflows/release.yaml
@@ -17,9 +17,9 @@ jobs:
           - TARGET: x86_64-unknown-linux-gnu # tested in a debian container on a mac
             OS: ubuntu-latest
           - TARGET: x86_64-apple-darwin # tested on a mac
-            OS: macos-latest
+            OS: macos-14
           - TARGET: aarch64-apple-darwin
-            OS: macos-arm-latest
+            OS: macos-14-arm
     name: Create Release ${{ github.event_name == 'pull_request' && '(dry-run)' }}
     runs-on: ${{ matrix.OS }}
     env:

From edf596210de7cf269d92e27c4b9a12e6be0bd66e Mon Sep 17 00:00:00 2001
From: Jonathan Grahl <jonathan@keyholders.io>
Date: Wed, 27 Mar 2024 07:40:02 -0500
Subject: [PATCH 4/4] ci: run both macos builds on macos-14

---
 .github/workflows/release.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
index 4e390f4..b4d4f2d 100644
--- a/.github/workflows/release.yaml
+++ b/.github/workflows/release.yaml
@@ -19,7 +19,7 @@ jobs:
           - TARGET: x86_64-apple-darwin # tested on a mac
             OS: macos-14
           - TARGET: aarch64-apple-darwin
-            OS: macos-14-arm
+            OS: macos-14
     name: Create Release ${{ github.event_name == 'pull_request' && '(dry-run)' }}
     runs-on: ${{ matrix.OS }}
     env: