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
3 changes: 2 additions & 1 deletion .github/workflows/lint-web.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,9 @@ jobs:
- name: Install pnpm
uses: pnpm/action-setup@008330803749db0355799c700092d9a85fd074e9 # v6.0.9
with:
package_json_file: web/package.json
cache: true
version: 11
run_install: false

- name: Install deps
working-directory: web
Expand Down
24 changes: 19 additions & 5 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -94,15 +94,29 @@ jobs:
- name: Install pnpm
uses: pnpm/action-setup@008330803749db0355799c700092d9a85fd074e9 # v6.0.9
with:
package_json_file: web/package.json
cache: true
version: 11
run_install: false

- name: Build frontend
working-directory: web
run: |
pnpm install --ignore-scripts --frozen-lockfile
pnpm build

- name: Build source code archive
run: tar --exclude='.github' --exclude-vcs --exclude-vcs-ignores --xform='s|^\./|proxy-${{ env.VERSION }}/|' --xz -cf ${{ runner.temp }}/defguard-proxy-${{ env.VERSION }}.tar.xz .

- name: Upload source code archive
uses: shogo82148/actions-upload-release-asset@394b3c11c3cfc038b5396ad265c074065cf875c3 # v1.10.2
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with:
upload_url: ${{ needs.create-release.outputs.upload_url }}
asset_path: ${{ runner.temp }}/defguard-proxy-${{ env.VERSION }}.tar.xz
asset_content_type: application/x-xz
overwrite: true

- name: Install Rust stable
uses: dtolnay/rust-toolchain@29eef336d9b2848a0b548edc03f92a220660cdb8 # stable
with:
Expand Down Expand Up @@ -353,14 +367,14 @@ jobs:
- name: Install pnpm
uses: pnpm/action-setup@008330803749db0355799c700092d9a85fd074e9 # v6.0.9
with:
version: 11
package_json_file: web/package.json
cache: true
run_install: false

# Change to '--frozen-lockfile' once this gets fixed:
# https://github.com/pnpm/action-setup/issues/40
- name: Build frontend
working-directory: web
run: |
pnpm install --ignore-scripts --no-frozen-lockfile
pnpm install --ignore-scripts --frozen-lockfile
pnpm build

- name: Install Rust stable
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ jobs:
tool: cargo-deny

- name: Run cargo deny
run: cargo deny check
run: cargo deny check --hide-inclusion-graph

- name: Run tests
run: cargo test --locked --no-fail-fast
11 changes: 1 addition & 10 deletions .trivyignore.yaml
Original file line number Diff line number Diff line change
@@ -1,10 +1 @@
vulnerabilities:
- id: GHSA-w5hq-g745-h8pq
expired_at: 2026-05-23
statement: "Waiting for upstream patch in paraglide"
- id: CVE-2026-29111
expired_at: 2026-05-31
statement: "No fixed version available in debian:13-slim - waiting for Debian to backport systemd patch"
- id: CVE-2025-69720
expired_at: 2026-05-31
statement: "No fixed version available in debian:13-slim - waiting for Debian to release ncurses patch"
vulnerabilities: []
1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
{
"packageManager": "pnpm@11.9.0",
"devDependencies": {
"@tanstack/devtools-vite": "^0.3.12"
}
Expand Down
4 changes: 4 additions & 0 deletions renovate.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
{
"$schema": "https://docs.renovatebot.com/renovate-schema.json",
"extends": ["github>DefGuard/ci-workflows//renovate/default.json"]
}
1 change: 1 addition & 0 deletions web/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
"name": "web",
"private": true,
"version": "0.0.1",
"packageManager": "pnpm@11.9.0",
"type": "module",
"scripts": {
"dev": "vite",
Expand Down
Loading