From d93c64a72e6e89bc8d14403e1704c4852c31a548 Mon Sep 17 00:00:00 2001
From: cydezen <cydezen@proton.me>
Date: Mon, 6 Oct 2025 20:27:33 +0200
Subject: [PATCH 1/4] ci: extend build matrix with macOS archtiectures

---
 .github/workflows/build.yml   | 14 ++++++++++++++
 .github/workflows/nightly.yml | 14 ++++++++++++++
 2 files changed, 28 insertions(+)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 6897a3e..1a69f82 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -32,6 +32,20 @@ jobs:
             bin_name: runtipi-cli
             artifact_name: runtipi-cli-linux-x86_64
 
+          - release_for: macos-intel
+            os: ubuntu-latest
+            goos: darwin
+            goarch: amd64
+            bin_name: runtipi-cli
+            artifact_name: runtipi-cli-macos-intel
+
+          - release_for: macos-apple-silicon
+            os: ubuntu-latest
+            goos: darwin
+            goarch: arm64
+            bin_name: runtipi-cli
+            artifact_name: runtipi-cli-macos-apple-silicon
+
     runs-on: ${{ matrix.platform.os }}
     steps:
       - name: Echo distinct ID ${{ github.event.inputs.distinct_id }}
diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml
index 1358ded..17c3539 100644
--- a/.github/workflows/nightly.yml
+++ b/.github/workflows/nightly.yml
@@ -27,6 +27,20 @@ jobs:
             goarch: amd64
             bin_name: runtipi-cli
             artifact_name: runtipi-cli-linux-x86_64
+            
+          - release_for: macos-intel
+            os: ubuntu-latest
+            goos: darwin
+            goarch: amd64
+            bin_name: runtipi-cli
+            artifact_name: runtipi-cli-macos-intel
+
+          - release_for: macos-apple-silicon
+            os: ubuntu-latest
+            goos: darwin
+            goarch: arm64
+            bin_name: runtipi-cli
+            artifact_name: runtipi-cli-macos-apple-silicon
 
     runs-on: ${{ matrix.platform.os }}
     steps:

From f166fd1d95113d453e6a70170a466db39d09f3b0 Mon Sep 17 00:00:00 2001
From: cydezen <cydezen@proton.me>
Date: Tue, 7 Oct 2025 13:58:13 +0200
Subject: [PATCH 2/4] fix: enable upx compression only for linux artifacts and
 publish also non-linux artifacts

---
 .github/workflows/build.yml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 1a69f82..b1a88f0 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -73,6 +73,7 @@ jobs:
             ./cmd/runtipi/main.go
 
       - name: Compress with upx
+        if: {{ matrix.platform.goos == 'linux'}}
         run: |
           sudo apt-get install -y upx
           upx --best --lzma ${{ matrix.platform.bin_name }}
@@ -96,10 +97,10 @@ jobs:
         uses: actions/download-artifact@v5
 
       - name: Move artifacts
-        run: for dir in runtipi-cli-linux-*; do mv "$dir/runtipi-cli" "${dir}.cli" && rm -rf "$dir" && mv "${dir}.cli" "$dir"; done
+        run: for dir in runtipi-cli-*; do mv "$dir/runtipi-cli" "${dir}.cli" && rm -rf "$dir" && mv "${dir}.cli" "$dir"; done
 
       - name: Compress artifacts
-        run: for file in runtipi-cli-linux-*; do tar -czvf "$file.tar.gz" "$file" && rm -rf "$file"; done
+        run: for file in runtipi-cli-*; do tar -czvf "$file.tar.gz" "$file" && rm -rf "$file"; done
 
       - name: Create release
         id: create_release

From c7de7cddbfa028228e23641ec99d46f2cec53821 Mon Sep 17 00:00:00 2001
From: cydezen <cydezen@proton.me>
Date: Tue, 7 Oct 2025 14:07:28 +0200
Subject: [PATCH 3/4] fix: syntax error in workflow if statement

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

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index b1a88f0..9c890e0 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -73,7 +73,7 @@ jobs:
             ./cmd/runtipi/main.go
 
       - name: Compress with upx
-        if: {{ matrix.platform.goos == 'linux'}}
+        if: matrix.platform.goos == 'linux'
         run: |
           sudo apt-get install -y upx
           upx --best --lzma ${{ matrix.platform.bin_name }}

From 85d118f16fd61b65e343c59eb40b7ca216a31c96 Mon Sep 17 00:00:00 2001
From: cydezen <cydezen@proton.me>
Date: Tue, 7 Oct 2025 14:08:06 +0200
Subject: [PATCH 4/4] fix: apply fixes also to nightly workflow

---
 .github/workflows/nightly.yml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml
index 17c3539..5bd43e0 100644
--- a/.github/workflows/nightly.yml
+++ b/.github/workflows/nightly.yml
@@ -69,6 +69,7 @@ jobs:
             ./cmd/runtipi/main.go
 
       - name: Compress with upx
+        if: matrix.platform.goos == 'linux'
         run: |
           sudo apt-get install -y upx
           upx --best --lzma ${{ matrix.platform.bin_name }}
@@ -92,10 +93,10 @@ jobs:
         uses: actions/download-artifact@v5
 
       - name: Move artifacts
-        run: for dir in runtipi-cli-linux-*; do mv "$dir/runtipi-cli" "${dir}.cli" && rm -rf "$dir" && mv "${dir}.cli" "$dir"; done
+        run: for dir in runtipi-cli-*; do mv "$dir/runtipi-cli" "${dir}.cli" && rm -rf "$dir" && mv "${dir}.cli" "$dir"; done
 
       - name: Compress artifacts
-        run: for file in runtipi-cli-linux-*; do tar -czvf "$file.tar.gz" "$file" && rm -rf "$file"; done
+        run: for file in runtipi-cli-*; do tar -czvf "$file.tar.gz" "$file" && rm -rf "$file"; done
 
       - uses: pyTooling/Actions/releaser@r0
         with: