Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion .github/workflows/build-macos.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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: |
Expand Down
11 changes: 2 additions & 9 deletions src-tauri/Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 1 addition & 2 deletions src-tauri/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
8 changes: 4 additions & 4 deletions swift/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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