From 69fd78b754cafe54e652d0615f71eca0cbb2b053 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Adam=20Ciarcin=CC=81ski?= <adam@defguard.net>
Date: Mon, 17 Nov 2025 13:12:26 +0100
Subject: [PATCH 1/3] Workflow: use Tauri action

---
 .github/workflows/build-macos.yaml |  8 ++++----
 src-tauri/Cargo.lock               | 11 ++---------
 src-tauri/Cargo.toml               |  3 +--
 swift/build.sh                     |  8 ++++----
 4 files changed, 11 insertions(+), 19 deletions(-)

diff --git a/.github/workflows/build-macos.yaml b/.github/workflows/build-macos.yaml
index 41a65ba0..cec1bb17 100644
--- a/.github/workflows/build-macos.yaml
+++ b/.github/workflows/build-macos.yaml
@@ -5,6 +5,7 @@ on:
       - main
       - dev
       - "release/**"
+      - tauri_action
     paths-ignore:
       - "*.md"
       - "LICENSE"
@@ -62,14 +63,13 @@ jobs:
           sed -i '' "s,@BUILD_NUMBER@,${{ github.run_number }}," src-tauri/tauri.conf.json
           sed -i '' "s,@BUILD_NUMBER@,${{ github.run_number }}," swift/extension/VPNExtension.xcodeproj/project.pbxproj
 
-      - name: Build app
-        # Switch back to tauri-action when this gets merged https://github.com/tauri-apps/tauri/pull/14379
-        # uses: tauri-apps/tauri-action@v0.5.23 # .24 seems broken, TODO: update when fixed
+      - uses: tauri-apps/tauri-action@v0.5.25
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           # APPLE_CERTIFICATE: ${{ secrets.APPLE_CERTIFICATE }}
           # APPLE_CERTIFICATE_PASSWORD: ${{ secrets.APPLE_CERTIFICATE_PASSWORD }}
-        run: cd src-tauri && cargo tauri build --bundles app --target universal-apple-darwin
+        with:
+          args: --target universal-apple-darwin
 
       - name: Build installation package
         run: |
diff --git a/src-tauri/Cargo.lock b/src-tauri/Cargo.lock
index 3d45e8d1..daef3420 100644
--- a/src-tauri/Cargo.lock
+++ b/src-tauri/Cargo.lock
@@ -5278,13 +5278,12 @@ dependencies = [
 
 [[package]]
 name = "rust-ini"
-version = "0.21.1"
+version = "0.21.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4e310ef0e1b6eeb79169a1171daf9abcb87a2e17c03bee2c4bb100b55c75409f"
+checksum = "796e8d2b6696392a43bea58116b667fb4c29727dc5abd27d6acf338bb4f688c7"
 dependencies = [
  "cfg-if",
  "ordered-multimap",
- "trim-in-place",
 ]
 
 [[package]]
@@ -7418,12 +7417,6 @@ dependencies = [
  "petgraph 0.8.3",
 ]
 
-[[package]]
-name = "trim-in-place"
-version = "0.1.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "343e926fc669bc8cde4fa3129ab681c63671bae288b1f1081ceee6d9d37904fc"
-
 [[package]]
 name = "try-lock"
 version = "0.2.5"
diff --git a/src-tauri/Cargo.toml b/src-tauri/Cargo.toml
index 18b44c60..4a1f1a50 100644
--- a/src-tauri/Cargo.toml
+++ b/src-tauri/Cargo.toml
@@ -72,8 +72,7 @@ log = { version = "0.4", features = ["serde"] }
 prost.workspace = true
 regex = "1.11"
 reqwest.workspace = true
-# 0.21.2 causes config parsing errors
-rust-ini = "=0.21.1"
+rust-ini = "0.21"
 semver = "1.0"
 serde.workspace = true
 serde_json.workspace = true
diff --git a/swift/build.sh b/swift/build.sh
index c514ccab..04112714 100755
--- a/swift/build.sh
+++ b/swift/build.sh
@@ -45,9 +45,9 @@ popd
 
 # Build VPNExtension.
 
-if [ "${TAURI_ENV_DEBUG}" = 'false' ]; then
+# if [ "${TAURI_ENV_DEBUG}" = 'false' ]; then
     CONFIG=Release
-else
-    CONFIG=Debug
-fi
+# else
+#     CONFIG=Debug
+# fi
 xcodebuild -project extension/VPNExtension.xcodeproj -target VPNExtension -configuration ${CONFIG} build

From 7a0fb75a5abdc1c816a505954e4d02a017b8116a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Adam=20Ciarcin=CC=81ski?= <adam@defguard.net>
Date: Mon, 17 Nov 2025 13:22:46 +0100
Subject: [PATCH 2/3] Restore cargo build

---
 .github/workflows/build-macos.yaml | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/build-macos.yaml b/.github/workflows/build-macos.yaml
index cec1bb17..022d2906 100644
--- a/.github/workflows/build-macos.yaml
+++ b/.github/workflows/build-macos.yaml
@@ -63,13 +63,16 @@ jobs:
           sed -i '' "s,@BUILD_NUMBER@,${{ github.run_number }}," src-tauri/tauri.conf.json
           sed -i '' "s,@BUILD_NUMBER@,${{ github.run_number }}," swift/extension/VPNExtension.xcodeproj/project.pbxproj
 
-      - uses: tauri-apps/tauri-action@v0.5.25
+      - name: Build app
+        # Switch back to tauri-action when this gets merged https://github.com/tauri-apps/tauri/pull/14379
+        # uses: tauri-apps/tauri-action@v0 # 0.5.24 seems to be broken, TODO: update when fixed
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           # APPLE_CERTIFICATE: ${{ secrets.APPLE_CERTIFICATE }}
           # APPLE_CERTIFICATE_PASSWORD: ${{ secrets.APPLE_CERTIFICATE_PASSWORD }}
-        with:
-          args: --target universal-apple-darwin
+        run: cd src-tauri && cargo tauri build --bundles app --target universal-apple-darwin
+        # with:
+        #   args: --target universal-apple-darwin
 
       - name: Build installation package
         run: |

From a821d7e2bc890f3d8b86e863baf41e56ca878eb1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Adam=20Ciarcin=CC=81ski?= <adam@defguard.net>
Date: Mon, 17 Nov 2025 13:31:51 +0100
Subject: [PATCH 3/3] Remove test branch

---
 .github/workflows/build-macos.yaml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.github/workflows/build-macos.yaml b/.github/workflows/build-macos.yaml
index 022d2906..54c24c11 100644
--- a/.github/workflows/build-macos.yaml
+++ b/.github/workflows/build-macos.yaml
@@ -5,7 +5,6 @@ on:
       - main
       - dev
       - "release/**"
-      - tauri_action
     paths-ignore:
       - "*.md"
       - "LICENSE"