Skip to content

Commit 84429c7

Browse files
moubctezmoubctez
committed
Bump version to 1.6.9 and disable Windows workflow
1 parent 4ddcd42 commit 84429c7

8 files changed

Lines changed: 865 additions & 1224 deletions

File tree

‎.github/workflows/release.yaml‎

Lines changed: 105 additions & 115 deletions
Original file line numberDiff line numberDiff line change
@@ -205,15 +205,12 @@ jobs:
205205
asset_path: src-tauri/target/release/bundle/deb/defguard-client_${{ env.VERSION }}_${{ matrix.deb_arch }}.deb
206206
asset_name: defguard-client_${{ env.VERSION }}_${{ matrix.deb_arch }}.deb
207207
asset_content_type: application/octet-stream
208-
- name: Rename client binary
209-
run: mv src-tauri/target/release/defguard-client defguard-client-linux-${{ matrix.binary_arch }}-${{ github.ref_name }}
208+
- name: Rename and tar client binary
210209
- name: Tar client binary
211-
uses: a7ul/tar-action@v1.2.0
212-
with:
213-
command: c
214-
files: |
210+
run: |
211+
mv src-tauri/target/release/defguard-client defguard-client-linux-${{ matrix.binary_arch }}-${{ github.ref_name }}
212+
tar -zcf defguard-client-linux-${{ matrix.binary_arch }}-${{ github.ref_name }}.tar.gz \
215213
defguard-client-linux-${{ matrix.binary_arch }}-${{ github.ref_name }}
216-
outPath: defguard-client-linux-${{ matrix.binary_arch }}-${{ github.ref_name }}.tar.gz
217214
- name: Upload client archive
218215
uses: actions/upload-release-asset@v1
219216
env:
@@ -223,15 +220,12 @@ jobs:
223220
asset_path: defguard-client-linux-${{ matrix.binary_arch }}-${{ github.ref_name }}.tar.gz
224221
asset_name: defguard-client-linux-${{ matrix.binary_arch }}-${{ github.ref_name }}.tar.gz
225222
asset_content_type: application/octet-stream
226-
- name: Rename daemon binary
227-
run: mv src-tauri/target/release/defguard-service defguard-service-linux-${{ matrix.binary_arch }}-${{ github.ref_name }}
223+
- name: Rename and tar daemon binary
228224
- name: Tar daemon binary
229-
uses: a7ul/tar-action@v1.2.0
230-
with:
231-
command: c
232-
files: |
225+
run: |
226+
mv src-tauri/target/release/defguard-service defguard-service-linux-${{ matrix.binary_arch }}-${{ github.ref_name }}
227+
tar -zcf defguard-service-linux-${{ matrix.binary_arch }}-${{ github.ref_name }}.tar.gz \
233228
defguard-service-linux-${{ matrix.binary_arch }}-${{ github.ref_name }}
234-
outPath: defguard-service-linux-${{ matrix.binary_arch }}-${{ github.ref_name }}.tar.gz
235229
- name: Upload daemon archive
236230
uses: actions/upload-release-asset@v1
237231
env:
@@ -242,15 +236,11 @@ jobs:
242236
asset_name: defguard-service-linux-${{ matrix.binary_arch }}-${{ github.ref_name }}.tar.gz
243237
asset_content_type: application/octet-stream
244238

245-
- name: Rename dg binary
246-
run: mv src-tauri/target/release/dg dg-linux-${{ matrix.binary_arch }}-${{ github.ref_name }}
247-
- name: Tar dg binary
248-
uses: a7ul/tar-action@v1.2.0
249-
with:
250-
command: c
251-
files: |
239+
- name: Rename and tar dg binary
240+
run: |
241+
mv src-tauri/target/release/dg dg-linux-${{ matrix.binary_arch }}-${{ github.ref_name }}
242+
tar -zcf dg-linux-${{ matrix.binary_arch }}-${{ github.ref_name }}.tar.gz \
252243
dg-linux-${{ matrix.binary_arch }}-${{ github.ref_name }}
253-
outPath: dg-linux-${{ matrix.binary_arch }}-${{ github.ref_name }}.tar.gz
254244
- name: Upload dg archive
255245
uses: actions/upload-release-asset@v1
256246
env:
@@ -290,98 +280,98 @@ jobs:
290280
asset_content_type: application/octet-stream
291281

292282
# Builds Windows MSI and uploads it as artifact
293-
build-windows:
294-
needs:
295-
- create-release
296-
strategy:
297-
fail-fast: false
298-
matrix:
299-
windows_runner:
300-
- windows-latest
301-
- windows-11-arm
302-
include:
303-
- windows_runner: windows-latest
304-
cpu: x64
305-
- windows_runner: windows-11-arm
306-
cpu: arm64
307-
runs-on: ${{ matrix.windows_runner }}
308-
steps:
309-
- uses: actions/checkout@v6
310-
with:
311-
submodules: recursive
312-
- name: Write release version
313-
run: |
314-
$env:VERSION=echo ($env:GITHUB_REF_NAME.Substring(1) -Split "-")[0]
315-
echo Version: $env:VERSION
316-
echo "VERSION=$env:VERSION" >> $env:GITHUB_ENV
317-
- uses: actions/setup-node@v6
318-
with:
319-
node-version: "24"
320-
- uses: pnpm/action-setup@v5
321-
with:
322-
version: 10
323-
run_install: false
324-
- name: Get pnpm store directory
325-
shell: bash
326-
run: echo "STORE_PATH=$(pnpm store path --silent)" >> ${GITHUB_ENV}
327-
- uses: actions/cache@v5
328-
name: Setup pnpm cache
329-
with:
330-
path: ${{ env.STORE_PATH }}
331-
key: ${{ runner.os }}-pnpm-build-store-${{ hashFiles('**/pnpm-lock.yaml') }}
332-
restore-keys: |
333-
${{ runner.os }}-pnpm-build-store-
334-
- name: Install deps
335-
run: pnpm install --frozen-lockfile
336-
- uses: dtolnay/rust-toolchain@stable
337-
- name: Install Protoc
338-
uses: arduino/setup-protoc@v3
339-
with:
340-
repo-token: ${{ secrets.GITHUB_TOKEN }}
341-
- name: Build packages
342-
uses: tauri-apps/tauri-action@v0.5.23 # 0.5.24 - 0.6.1 give: Error: Could not find workspace directory, but version and/or name specifies to use workspace package
343-
env:
344-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
345-
- name: Upload unsigned bundle
346-
uses: actions/upload-artifact@v4
347-
with:
348-
name: unsigned-bundle-${{ matrix.cpu }}
349-
path: src-tauri/target/release/bundle/msi/Defguard_${{ env.VERSION }}_${{ matrix.cpu }}_en-US.msi
283+
# build-windows:
284+
# needs:
285+
# - create-release
286+
# strategy:
287+
# fail-fast: false
288+
# matrix:
289+
# windows_runner:
290+
# - windows-latest
291+
# - windows-11-arm
292+
# include:
293+
# - windows_runner: windows-latest
294+
# cpu: x64
295+
# - windows_runner: windows-11-arm
296+
# cpu: arm64
297+
# runs-on: ${{ matrix.windows_runner }}
298+
# steps:
299+
# - uses: actions/checkout@v6
300+
# with:
301+
# submodules: recursive
302+
# - name: Write release version
303+
# run: |
304+
# $env:VERSION=echo ($env:GITHUB_REF_NAME.Substring(1) -Split "-")[0]
305+
# echo Version: $env:VERSION
306+
# echo "VERSION=$env:VERSION" >> $env:GITHUB_ENV
307+
# - uses: actions/setup-node@v6
308+
# with:
309+
# node-version: "24"
310+
# - uses: pnpm/action-setup@v5
311+
# with:
312+
# version: 10
313+
# run_install: false
314+
# - name: Get pnpm store directory
315+
# shell: bash
316+
# run: echo "STORE_PATH=$(pnpm store path --silent)" >> ${GITHUB_ENV}
317+
# - uses: actions/cache@v5
318+
# name: Setup pnpm cache
319+
# with:
320+
# path: ${{ env.STORE_PATH }}
321+
# key: ${{ runner.os }}-pnpm-build-store-${{ hashFiles('**/pnpm-lock.yaml') }}
322+
# restore-keys: |
323+
# ${{ runner.os }}-pnpm-build-store-
324+
# - name: Install deps
325+
# run: pnpm install --frozen-lockfile
326+
# - uses: dtolnay/rust-toolchain@stable
327+
# - name: Install Protoc
328+
# uses: arduino/setup-protoc@v3
329+
# with:
330+
# repo-token: ${{ secrets.GITHUB_TOKEN }}
331+
# - name: Build packages
332+
# uses: tauri-apps/tauri-action@v0.5.23 # 0.5.24 - 0.6.1 give: Error: Could not find workspace directory, but version and/or name specifies to use workspace package
333+
# env:
334+
# GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
335+
# - name: Upload unsigned bundle
336+
# uses: actions/upload-artifact@v4
337+
# with:
338+
# name: unsigned-bundle-${{ matrix.cpu }}
339+
# path: src-tauri/target/release/bundle/msi/Defguard_${{ env.VERSION }}_${{ matrix.cpu }}_en-US.msi
350340

351341
# Signs the MSI and uploads it as release asset
352-
sign-bundle:
353-
needs:
354-
- create-release
355-
- build-windows
356-
strategy:
357-
fail-fast: false
358-
matrix:
359-
# Match CPUs from build-windows above.
360-
cpu:
361-
- x64
362-
- arm64
363-
runs-on:
364-
- self-hosted
365-
- Linux
366-
- X64
367-
steps:
368-
- name: Write release version
369-
run: |
370-
VERSION=$(echo ${GITHUB_REF_NAME#v} | cut -d '-' -f1)
371-
echo Version: $VERSION
372-
echo "VERSION=$VERSION" >> ${GITHUB_ENV}
373-
- name: Download unsigned bundle
374-
uses: actions/download-artifact@v4
375-
with:
376-
name: unsigned-bundle-${{ matrix.cpu }}
377-
- name: Sign bundle
378-
run: osslsigncode sign -pkcs11module /srv/codesign/certum/sc30pkcs11-3.0.6.72-MS.so -pkcs11cert ${{ secrets.CODESIGN_KEYID }} -key ${{ secrets.CODESIGN_KEYID }} -pass ${{ secrets.CODESIGN_PIN }} -h sha256 -t http://time.certum.pl/ -in Defguard_${{ env.VERSION }}_${{ matrix.cpu }}_en-US.msi -out Defguard-signed.msi
379-
- name: Upload installer asset
380-
uses: actions/upload-release-asset@v1
381-
env:
382-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
383-
with:
384-
upload_url: ${{ needs.create-release.outputs.upload_url }}
385-
asset_path: Defguard-signed.msi
386-
asset_name: Defguard_${{ env.VERSION }}_${{ matrix.cpu }}_en-US.msi
387-
asset_content_type: application/octet-stream
342+
# sign-bundle:
343+
# needs:
344+
# - create-release
345+
# - build-windows
346+
# strategy:
347+
# fail-fast: false
348+
# matrix:
349+
# # Match CPUs from build-windows above.
350+
# cpu:
351+
# - x64
352+
# - arm64
353+
# runs-on:
354+
# - self-hosted
355+
# - Linux
356+
# - X64
357+
# steps:
358+
# - name: Write release version
359+
# run: |
360+
# VERSION=$(echo ${GITHUB_REF_NAME#v} | cut -d '-' -f1)
361+
# echo Version: $VERSION
362+
# echo "VERSION=$VERSION" >> ${GITHUB_ENV}
363+
# - name: Download unsigned bundle
364+
# uses: actions/download-artifact@v4
365+
# with:
366+
# name: unsigned-bundle-${{ matrix.cpu }}
367+
# - name: Sign bundle
368+
# run: osslsigncode sign -pkcs11module /srv/codesign/certum/sc30pkcs11-3.0.6.72-MS.so -pkcs11cert ${{ secrets.CODESIGN_KEYID }} -key ${{ secrets.CODESIGN_KEYID }} -pass ${{ secrets.CODESIGN_PIN }} -h sha256 -t http://time.certum.pl/ -in Defguard_${{ env.VERSION }}_${{ matrix.cpu }}_en-US.msi -out Defguard-signed.msi
369+
# - name: Upload installer asset
370+
# uses: actions/upload-release-asset@v1
371+
# env:
372+
# GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
373+
# with:
374+
# upload_url: ${{ needs.create-release.outputs.upload_url }}
375+
# asset_path: Defguard-signed.msi
376+
# asset_name: Defguard_${{ env.VERSION }}_${{ matrix.cpu }}_en-US.msi
377+
# asset_content_type: application/octet-stream

‎biome.json‎

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"$schema": "https://biomejs.dev/schemas/2.4.13/schema.json",
2+
"$schema": "https://biomejs.dev/schemas/2.4.15/schema.json",
33
"vcs": {
44
"enabled": false,
55
"clientKind": "git",
@@ -27,7 +27,9 @@
2727
"bracketSpacing": true,
2828
"expand": "auto",
2929
"useEditorconfig": true,
30-
"includes": ["./src/**"]
30+
"includes": [
31+
"./src/**"
32+
]
3133
},
3234
"linter": {
3335
"enabled": true,
@@ -68,7 +70,9 @@
6870
"noArrayIndexKey": "off"
6971
}
7072
},
71-
"includes": ["src/**"]
73+
"includes": [
74+
"src/**"
75+
]
7276
},
7377
"javascript": {
7478
"formatter": {
@@ -90,7 +94,9 @@
9094
},
9195
"overrides": [
9296
{
93-
"includes": ["**/*.js"]
97+
"includes": [
98+
"**/*.js"
99+
]
94100
}
95101
],
96102
"assist": {

‎package.json‎

Lines changed: 20 additions & 20 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.8",
4+
"version": "1.6.9",
55
"type": "module",
66
"scripts": {
77
"dev": "npm-run-all --parallel vite typesafe-i18n",
@@ -56,17 +56,17 @@
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.100.5",
59+
"@tanstack/query-core": "^5.100.9",
6060
"@tanstack/react-virtual": "^3.13.24",
6161
"@tauri-apps/api": "^2.11.0",
6262
"@tauri-apps/plugin-clipboard-manager": "^2.3.2",
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",
63+
"@tauri-apps/plugin-deep-link": "^2.4.9",
64+
"@tauri-apps/plugin-dialog": "^2.7.1",
65+
"@tauri-apps/plugin-fs": "^2.5.1",
66+
"@tauri-apps/plugin-http": "^2.5.9",
6767
"@tauri-apps/plugin-log": "^2.8.0",
6868
"@tauri-apps/plugin-notification": "^2.3.3",
69-
"@tauri-apps/plugin-opener": "^2.5.3",
69+
"@tauri-apps/plugin-opener": "^2.5.4",
7070
"@tauri-apps/plugin-os": "^2.3.2",
7171
"@tauri-apps/plugin-process": "^2.3.1",
7272
"@tauri-apps/plugin-window-state": "^2.4.1",
@@ -92,15 +92,15 @@
9292
"p-timeout": "^6.1.4",
9393
"prop-types": "^15.8.1",
9494
"radash": "^12.1.1",
95-
"react": "^19.2.5",
95+
"react": "^19.2.6",
9696
"react-auth-code-input": "^3.2.1",
9797
"react-click-away-listener": "^2.4.1",
98-
"react-dom": "^19.2.5",
99-
"react-hook-form": "^7.74.0",
100-
"react-hotkeys-hook": "^5.2.4",
98+
"react-dom": "^19.2.6",
99+
"react-hook-form": "^7.75.0",
100+
"react-hotkeys-hook": "^5.3.2",
101101
"react-loading-skeleton": "^3.5.0",
102102
"react-markdown": "^10.1.0",
103-
"react-qr-code": "^2.0.18",
103+
"react-qr-code": "^2.0.21",
104104
"react-router-dom": "^6.30.3",
105105
"react-use-websocket": "^4.13.0",
106106
"react-virtualized-auto-sizer": "^1.0.26",
@@ -109,31 +109,31 @@
109109
"rxjs": "^7.8.2",
110110
"use-breakpoint": "^4.0.10",
111111
"zod": "^3.25.76",
112-
"zustand": "^5.0.12"
112+
"zustand": "^5.0.13"
113113
},
114114
"devDependencies": {
115-
"@biomejs/biome": "^2.4.13",
115+
"@biomejs/biome": "^2.4.15",
116116
"@hookform/devtools": "^4.4.0",
117117
"@svgr/cli": "^8.1.0",
118-
"@tanstack/react-query": "^5.100.5",
119-
"@tanstack/react-query-devtools": "^5.100.5",
120-
"@tauri-apps/cli": "^2.11.0",
118+
"@tanstack/react-query": "^5.100.9",
119+
"@tanstack/react-query-devtools": "^5.100.9",
120+
"@tauri-apps/cli": "^2.11.1",
121121
"@types/file-saver": "^2.0.7",
122122
"@types/lodash-es": "^4.17.12",
123-
"@types/node": "^24.12.2",
123+
"@types/node": "^24.12.3",
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",
128128
"autoprefixer": "^10.5.0",
129129
"npm-run-all": "^4.1.5",
130-
"postcss": "^8.5.12",
130+
"postcss": "^8.5.14",
131131
"prettier": "^3.8.3",
132132
"sass": "~1.92.1",
133133
"typedoc": "^0.28.19",
134134
"typesafe-i18n": "^5.27.1",
135135
"typescript": "^5.9.3",
136-
"vite": "^7.3.2"
136+
"vite": "^7.3.3"
137137
},
138138
"volta": {
139139
"node": "20.5.1"

0 commit comments

Comments
 (0)