Skip to content

Commit 55cd73b

Browse files
committed
Try tauri workflow
1 parent 5c0402c commit 55cd73b

8 files changed

Lines changed: 924 additions & 945 deletions

File tree

.github/workflows/build-macos.yaml

Lines changed: 8 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -35,17 +35,12 @@ jobs:
3535
3636
- uses: actions/setup-node@v6
3737
with:
38-
node-version: "24"
39-
cache: "pnpm"
38+
node-version: 25
4039

4140
- uses: pnpm/action-setup@v5
4241
with:
42+
cache: true
4343
version: 10
44-
run_install: false
45-
46-
- name: Get pnpm store directory
47-
shell: bash
48-
run: echo "STORE_PATH=$(pnpm store path --silent)" >> ${GITHUB_ENV}
4944

5045
- name: Install deps
5146
run: pnpm install --frozen-lockfile
@@ -54,24 +49,20 @@ jobs:
5449
with:
5550
targets: aarch64-apple-darwin,x86_64-apple-darwin
5651

57-
- name: Unlock keychain
58-
run: security -v unlock-keychain -p "${{ secrets.KEYCHAIN_PASSWORD }}" login.keychain
59-
6052
- name: Set build number
6153
run: |
6254
sed -i '' "s,@BUILD_NUMBER@,${{ github.run_number }}," src-tauri/tauri.conf.json
6355
sed -i '' "s,@BUILD_NUMBER@,${{ github.run_number }}," swift/extension/VPNExtension.xcodeproj/project.pbxproj
6456
57+
- name: Unlock keychain
58+
run: security -v unlock-keychain -p "${{ secrets.KEYCHAIN_PASSWORD }}" login.keychain
59+
6560
- name: Build app
66-
# Switch back to tauri-action when this gets merged https://github.com/tauri-apps/tauri/pull/14379
67-
# uses: tauri-apps/tauri-action@v0 # 0.5.24 seems to be broken, TODO: update when fixed
61+
uses: tauri-apps/tauri-action@v0
6862
env:
6963
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
70-
# APPLE_CERTIFICATE: ${{ secrets.APPLE_CERTIFICATE }}
71-
# APPLE_CERTIFICATE_PASSWORD: ${{ secrets.APPLE_CERTIFICATE_PASSWORD }}
72-
run: cd src-tauri && cargo tauri build --bundles app --target universal-apple-darwin
73-
# with:
74-
# args: --target universal-apple-darwin
64+
with:
65+
args: --target universal-apple-darwin
7566

7667
- name: Build installation package
7768
run: |
@@ -80,13 +71,3 @@ jobs:
8071
xcrun altool --upload-app --type macos --file defguard-client.pkg --apiKey ${{ secrets.APPLE_API_KEY }} --apiIssuer ${{ secrets.APPLE_API_ISSUER }}
8172
# xcrun notarytool submit --wait --apple-id ${{ env.APPLE_ID }} --password ${{ secrets.NOTARYTOOL_APP_SPECIFIC_PASSWORD }} --team-id ${{ env.APPLE_TEAM_ID }} defguard-client.pkg
8273
# xcrun stapler staple defguard-client.pkg
83-
84-
# - name: Upload installation package
85-
# uses: actions/upload-release-asset@v1
86-
# env:
87-
# GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
88-
# with:
89-
# upload_url: ${{ needs.create-release.outputs.upload_url }}
90-
# asset_path: defguard-client.pkg
91-
# asset_name: defguard-client-universal-${{ env.VERSION }}.pkg
92-
# asset_content_type: application/octet-stream

biome.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"$schema": "https://biomejs.dev/schemas/2.4.10/schema.json",
2+
"$schema": "https://biomejs.dev/schemas/2.4.12/schema.json",
33
"vcs": {
44
"enabled": false,
55
"clientKind": "git",

package.json

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "defguard-client",
33
"private": false,
4-
"version": "1.6.7",
4+
"version": "1.6.8",
55
"type": "module",
66
"scripts": {
77
"dev": "npm-run-all --parallel vite typesafe-i18n",
@@ -56,14 +56,14 @@
5656
"@react-hook/resize-observer": "^2.0.2",
5757
"@stablelib/base64": "^2.0.1",
5858
"@stablelib/x25519": "^2.0.1",
59-
"@tanstack/query-core": "^5.95.2",
60-
"@tanstack/react-virtual": "^3.13.23",
59+
"@tanstack/query-core": "^5.99.2",
60+
"@tanstack/react-virtual": "^3.13.24",
6161
"@tauri-apps/api": "^2.10.1",
6262
"@tauri-apps/plugin-clipboard-manager": "^2.3.2",
63-
"@tauri-apps/plugin-deep-link": "^2.4.7",
64-
"@tauri-apps/plugin-dialog": "^2.6.0",
65-
"@tauri-apps/plugin-fs": "^2.4.5",
66-
"@tauri-apps/plugin-http": "^2.5.7",
63+
"@tauri-apps/plugin-deep-link": "^2.4.8",
64+
"@tauri-apps/plugin-dialog": "^2.7.0",
65+
"@tauri-apps/plugin-fs": "^2.5.0",
66+
"@tauri-apps/plugin-http": "^2.5.8",
6767
"@tauri-apps/plugin-log": "^2.8.0",
6868
"@tauri-apps/plugin-notification": "^2.3.3",
6969
"@tauri-apps/plugin-opener": "^2.5.3",
@@ -85,18 +85,18 @@
8585
"html-react-parser": "^5.2.17",
8686
"itertools": "^2.6.0",
8787
"js-base64": "^3.7.8",
88-
"lodash-es": "^4.17.23",
88+
"lodash-es": "^4.18.1",
8989
"merge-refs": "^2.0.0",
9090
"millify": "^6.1.0",
9191
"motion": "^12.38.0",
9292
"p-timeout": "^6.1.4",
9393
"prop-types": "^15.8.1",
9494
"radash": "^12.1.1",
95-
"react": "^19.2.4",
95+
"react": "^19.2.5",
9696
"react-auth-code-input": "^3.2.1",
97-
"react-click-away-listener": "^2.4.0",
98-
"react-dom": "^19.2.4",
99-
"react-hook-form": "^7.72.0",
97+
"react-click-away-listener": "^2.4.1",
98+
"react-dom": "^19.2.5",
99+
"react-hook-form": "^7.72.1",
100100
"react-hotkeys-hook": "^5.2.4",
101101
"react-loading-skeleton": "^3.5.0",
102102
"react-markdown": "^10.1.0",
@@ -112,28 +112,28 @@
112112
"zustand": "^5.0.12"
113113
},
114114
"devDependencies": {
115-
"@biomejs/biome": "^2.4.10",
115+
"@biomejs/biome": "^2.4.12",
116116
"@hookform/devtools": "^4.4.0",
117117
"@svgr/cli": "^8.1.0",
118-
"@tanstack/react-query": "^5.95.2",
119-
"@tanstack/react-query-devtools": "^5.95.2",
118+
"@tanstack/react-query": "^5.99.2",
119+
"@tanstack/react-query-devtools": "^5.99.2",
120120
"@tauri-apps/cli": "^2.10.1",
121121
"@types/file-saver": "^2.0.7",
122122
"@types/lodash-es": "^4.17.12",
123-
"@types/node": "^24.12.0",
123+
"@types/node": "^24.12.2",
124124
"@types/react": "^19.2.14",
125125
"@types/react-dom": "^19.2.3",
126126
"@vitejs/plugin-react": "^5.2.0",
127127
"@vitejs/plugin-react-swc": "^4.3.0",
128-
"autoprefixer": "^10.4.27",
128+
"autoprefixer": "^10.5.0",
129129
"npm-run-all": "^4.1.5",
130-
"postcss": "^8.5.8",
131-
"prettier": "^3.8.1",
130+
"postcss": "^8.5.10",
131+
"prettier": "^3.8.3",
132132
"sass": "~1.92.1",
133-
"typedoc": "^0.28.18",
133+
"typedoc": "^0.28.19",
134134
"typesafe-i18n": "^5.27.1",
135135
"typescript": "^5.9.3",
136-
"vite": "^7.3.1"
136+
"vite": "^7.3.2"
137137
},
138138
"volta": {
139139
"node": "20.5.1"

0 commit comments

Comments
 (0)