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
35 changes: 8 additions & 27 deletions .github/workflows/build-macos.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -35,17 +35,12 @@ jobs:

- uses: actions/setup-node@v6
with:
node-version: "24"
cache: "pnpm"
node-version: 25

- uses: pnpm/action-setup@v5
with:
cache: true
version: 10
run_install: false

- name: Get pnpm store directory
shell: bash
run: echo "STORE_PATH=$(pnpm store path --silent)" >> ${GITHUB_ENV}

- name: Install deps
run: pnpm install --frozen-lockfile
Expand All @@ -54,24 +49,20 @@ jobs:
with:
targets: aarch64-apple-darwin,x86_64-apple-darwin

- name: Unlock keychain
run: security -v unlock-keychain -p "${{ secrets.KEYCHAIN_PASSWORD }}" login.keychain

- name: Set build number
run: |
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: Unlock keychain
run: security -v unlock-keychain -p "${{ secrets.KEYCHAIN_PASSWORD }}" login.keychain

- 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
uses: tauri-apps/tauri-action@v0
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
with:
args: --target universal-apple-darwin

- name: Build installation package
run: |
Expand All @@ -80,13 +71,3 @@ jobs:
xcrun altool --upload-app --type macos --file defguard-client.pkg --apiKey ${{ secrets.APPLE_API_KEY }} --apiIssuer ${{ secrets.APPLE_API_ISSUER }}
# xcrun notarytool submit --wait --apple-id ${{ env.APPLE_ID }} --password ${{ secrets.NOTARYTOOL_APP_SPECIFIC_PASSWORD }} --team-id ${{ env.APPLE_TEAM_ID }} defguard-client.pkg
# xcrun stapler staple defguard-client.pkg

# - name: Upload installation package
# uses: actions/upload-release-asset@v1
# env:
# GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
# with:
# upload_url: ${{ needs.create-release.outputs.upload_url }}
# asset_path: defguard-client.pkg
# asset_name: defguard-client-universal-${{ env.VERSION }}.pkg
# asset_content_type: application/octet-stream
2 changes: 1 addition & 1 deletion biome.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"$schema": "https://biomejs.dev/schemas/2.4.10/schema.json",
"$schema": "https://biomejs.dev/schemas/2.4.12/schema.json",
"vcs": {
"enabled": false,
"clientKind": "git",
Expand Down
40 changes: 20 additions & 20 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "defguard-client",
"private": false,
"version": "1.6.7",
"version": "1.6.8",
"type": "module",
"scripts": {
"dev": "npm-run-all --parallel vite typesafe-i18n",
Expand Down Expand Up @@ -56,14 +56,14 @@
"@react-hook/resize-observer": "^2.0.2",
"@stablelib/base64": "^2.0.1",
"@stablelib/x25519": "^2.0.1",
"@tanstack/query-core": "^5.95.2",
"@tanstack/react-virtual": "^3.13.23",
"@tanstack/query-core": "^5.99.2",
"@tanstack/react-virtual": "^3.13.24",
"@tauri-apps/api": "^2.10.1",
"@tauri-apps/plugin-clipboard-manager": "^2.3.2",
"@tauri-apps/plugin-deep-link": "^2.4.7",
"@tauri-apps/plugin-dialog": "^2.6.0",
"@tauri-apps/plugin-fs": "^2.4.5",
"@tauri-apps/plugin-http": "^2.5.7",
"@tauri-apps/plugin-deep-link": "^2.4.8",
"@tauri-apps/plugin-dialog": "^2.7.0",
"@tauri-apps/plugin-fs": "^2.5.0",
"@tauri-apps/plugin-http": "^2.5.8",
"@tauri-apps/plugin-log": "^2.8.0",
"@tauri-apps/plugin-notification": "^2.3.3",
"@tauri-apps/plugin-opener": "^2.5.3",
Expand Down Expand Up @@ -92,11 +92,11 @@
"p-timeout": "^6.1.4",
"prop-types": "^15.8.1",
"radash": "^12.1.1",
"react": "^19.2.4",
"react": "^19.2.5",
"react-auth-code-input": "^3.2.1",
"react-click-away-listener": "^2.4.0",
"react-dom": "^19.2.4",
"react-hook-form": "^7.72.0",
"react-click-away-listener": "^2.4.1",
"react-dom": "^19.2.5",
"react-hook-form": "^7.72.1",
"react-hotkeys-hook": "^5.2.4",
"react-loading-skeleton": "^3.5.0",
"react-markdown": "^10.1.0",
Expand All @@ -112,28 +112,28 @@
"zustand": "^5.0.12"
},
"devDependencies": {
"@biomejs/biome": "^2.4.10",
"@biomejs/biome": "^2.4.12",
"@hookform/devtools": "^4.4.0",
"@svgr/cli": "^8.1.0",
"@tanstack/react-query": "^5.95.2",
"@tanstack/react-query-devtools": "^5.95.2",
"@tanstack/react-query": "^5.99.2",
"@tanstack/react-query-devtools": "^5.99.2",
"@tauri-apps/cli": "^2.10.1",
"@types/file-saver": "^2.0.7",
"@types/lodash-es": "^4.17.12",
"@types/node": "^24.12.0",
"@types/node": "^24.12.2",
"@types/react": "^19.2.14",
"@types/react-dom": "^19.2.3",
"@vitejs/plugin-react": "^5.2.0",
"@vitejs/plugin-react-swc": "^4.3.0",
"autoprefixer": "^10.4.27",
"autoprefixer": "^10.5.0",
"npm-run-all": "^4.1.5",
"postcss": "^8.5.8",
"prettier": "^3.8.1",
"postcss": "^8.5.10",
"prettier": "^3.8.3",
"sass": "~1.92.1",
"typedoc": "^0.28.18",
"typedoc": "^0.28.19",
"typesafe-i18n": "^5.27.1",
"typescript": "^5.9.3",
"vite": "^7.3.1"
"vite": "^7.3.2"
},
"volta": {
"node": "20.5.1"
Expand Down
Loading
Loading