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
34 changes: 25 additions & 9 deletions .github/workflows/release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,8 @@ jobs:
generate_release_notes: true

create-sbom:
needs: [create-release]
needs:
- create-release
uses: ./.github/workflows/sbom.yml
with:
upload_url: ${{ needs.create-release.outputs.upload_url }}
Expand Down Expand Up @@ -292,7 +293,18 @@ jobs:
build-windows:
needs:
- create-release
runs-on: windows-latest
strategy:
fail-fast: false
matrix:
windows_runner:
- windows-latest
- windows-11-arm
include:
- windows_runner: windows-latest
cpu: x64
- windows_runner: windows-11-arm
cpu: arm64
runs-on: ${{ matrix.windows_runner }}
steps:
- uses: actions/checkout@v6
with:
Expand Down Expand Up @@ -326,24 +338,28 @@ jobs:
uses: arduino/setup-protoc@v3
with:
repo-token: ${{ secrets.GITHUB_TOKEN }}
- name: Remove "default-run" line from Cargo.toml
run: |
Set-Content -Path ".\src-tauri\Cargo.toml" -Value (get-content -Path ".\src-tauri\Cargo.toml" | Select-String -Pattern 'default-run =' -NotMatch)
- name: Build packages
uses: tauri-apps/tauri-action@v0.5.23 # .24 seems broken, TODO: update when fixed
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
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
- name: Upload unsigned bundle
uses: actions/upload-artifact@v4
with:
name: unsigned-bundle
path: src-tauri/target/release/bundle/msi/Defguard_${{ env.VERSION }}_x64_en-US.msi
path: src-tauri/target/release/bundle/msi/Defguard_${{ env.VERSION }}_${{ matrix.cpu }}_en-US.msi

# Signs the MSI and uploads it as release asset
sign-bundle:
needs:
- create-release
- build-windows
strategy:
fail-fast: false
matrix:
# Match CPUs from build-windows above.
cpu:
- x64
- arm64
runs-on:
- self-hosted
- Linux
Expand All @@ -359,13 +375,13 @@ jobs:
with:
name: unsigned-bundle
- name: Sign bundle
run: osslsigncode sign -pkcs11module /srv/codesign/certum/sc30pkcs11-3.0.6.71-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 }}_x64_en-US.msi -out Defguard-signed.msi
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
- name: Upload installer asset
uses: actions/upload-release-asset@v1
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with:
upload_url: ${{ needs.create-release.outputs.upload_url }}
asset_path: Defguard-signed.msi
asset_name: Defguard_${{ env.VERSION }}_x64_en-US.msi
asset_name: Defguard_${{ env.VERSION }}_${{ matrix.cpu }}_en-US.msi
asset_content_type: application/octet-stream
8 changes: 4 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@
"file-saver": "^2.0.5",
"get-text-width": "^1.0.3",
"html-react-parser": "^5.2.17",
"itertools": "^2.5.0",
"itertools": "^2.6.0",
"js-base64": "^3.7.8",
"lodash-es": "^4.17.23",
"merge-refs": "^2.0.0",
Expand Down Expand Up @@ -112,20 +112,20 @@
"zustand": "^5.0.11"
},
"devDependencies": {
"@biomejs/biome": "^2.3.13",
"@biomejs/biome": "^2.4.4",
"@hookform/devtools": "^4.4.0",
"@svgr/cli": "^8.1.0",
"@tanstack/react-query": "^5.90.21",
"@tanstack/react-query-devtools": "^5.91.3",
"@tauri-apps/cli": "^2.10.0",
"@types/file-saver": "^2.0.7",
"@types/lodash-es": "^4.17.12",
"@types/node": "^24.10.13",
"@types/node": "^24.11.0",
"@types/react": "^19.2.14",
"@types/react-dom": "^19.2.3",
"@vitejs/plugin-react": "^5.1.4",
"@vitejs/plugin-react-swc": "^4.2.3",
"autoprefixer": "^10.4.24",
"autoprefixer": "^10.4.27",
"npm-run-all": "^4.1.5",
"postcss": "^8.5.6",
"prettier": "^3.8.1",
Expand Down
Loading
Loading