diff --git a/.github/workflows/build-macos.yaml b/.github/workflows/build-macos.yaml index 41a65ba0..54c24c11 100644 --- a/.github/workflows/build-macos.yaml +++ b/.github/workflows/build-macos.yaml @@ -64,12 +64,14 @@ jobs: - 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 # 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 }} 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