From 00a6e67a5f585e7f5ed5bc0c2ec5f7e0a789dcdf Mon Sep 17 00:00:00 2001 From: Sean Morley Date: Mon, 23 Jun 2025 17:14:18 -0400 Subject: [PATCH 1/2] feat(workflows): add paths to push and pull_request triggers for backend and frontend workflows --- .github/workflows/backend-test.yml | 13 ++++++++++++- .github/workflows/frontend-test.yml | 13 ++++++++++++- .github/workflows/trivy_security_scans.yml | 8 ++++++++ 3 files changed, 32 insertions(+), 2 deletions(-) diff --git a/.github/workflows/backend-test.yml b/.github/workflows/backend-test.yml index a01cd48..6c81bc1 100644 --- a/.github/workflows/backend-test.yml +++ b/.github/workflows/backend-test.yml @@ -4,8 +4,19 @@ permissions: contents: read on: - pull_request: push: + branches: + - main + - development + paths: + - "backend/**" + + pull_request: + branches: + - main + - development + paths: + - "backend/**" jobs: build: diff --git a/.github/workflows/frontend-test.yml b/.github/workflows/frontend-test.yml index 8a95cd8..1d53a48 100644 --- a/.github/workflows/frontend-test.yml +++ b/.github/workflows/frontend-test.yml @@ -4,8 +4,19 @@ permissions: contents: read on: - pull_request: push: + branches: + - main + - development + paths: + - "frontend/**" + + pull_request: + branches: + - main + - development + paths: + - "frontend/**" jobs: build: diff --git a/.github/workflows/trivy_security_scans.yml b/.github/workflows/trivy_security_scans.yml index a067ae6..8d4e7ff 100644 --- a/.github/workflows/trivy_security_scans.yml +++ b/.github/workflows/trivy_security_scans.yml @@ -5,10 +5,18 @@ on: branches: - main - development + paths: + - "backend/**" + - "frontend/**" + pull_request: branches: - main - development + paths: + - "backend/**" + - "frontend/**" + schedule: - cron: "0 8 * * 1" # Weekly scan on Mondays at 8 AM UTC From b6e5e4abc01702bf2019e133b31defa5999902dc Mon Sep 17 00:00:00 2001 From: Sean Morley Date: Mon, 23 Jun 2025 17:24:27 -0400 Subject: [PATCH 2/2] refactor(workflows): simplify trigger paths for backend and frontend workflows fix(dependencies): add overrides for esbuild in frontend package.json --- .github/workflows/backend-test.yml | 13 +------------ .github/workflows/frontend-test.yml | 13 +------------ .github/workflows/trivy_security_scans.yml | 8 -------- frontend/package.json | 3 +++ 4 files changed, 5 insertions(+), 32 deletions(-) diff --git a/.github/workflows/backend-test.yml b/.github/workflows/backend-test.yml index 6c81bc1..a01cd48 100644 --- a/.github/workflows/backend-test.yml +++ b/.github/workflows/backend-test.yml @@ -4,19 +4,8 @@ permissions: contents: read on: - push: - branches: - - main - - development - paths: - - "backend/**" - pull_request: - branches: - - main - - development - paths: - - "backend/**" + push: jobs: build: diff --git a/.github/workflows/frontend-test.yml b/.github/workflows/frontend-test.yml index 1d53a48..8a95cd8 100644 --- a/.github/workflows/frontend-test.yml +++ b/.github/workflows/frontend-test.yml @@ -4,19 +4,8 @@ permissions: contents: read on: - push: - branches: - - main - - development - paths: - - "frontend/**" - pull_request: - branches: - - main - - development - paths: - - "frontend/**" + push: jobs: build: diff --git a/.github/workflows/trivy_security_scans.yml b/.github/workflows/trivy_security_scans.yml index 8d4e7ff..a067ae6 100644 --- a/.github/workflows/trivy_security_scans.yml +++ b/.github/workflows/trivy_security_scans.yml @@ -5,18 +5,10 @@ on: branches: - main - development - paths: - - "backend/**" - - "frontend/**" - pull_request: branches: - main - development - paths: - - "backend/**" - - "frontend/**" - schedule: - cron: "0 8 * * 1" # Weekly scan on Mondays at 8 AM UTC diff --git a/frontend/package.json b/frontend/package.json index 95ff6c9..18b14a7 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -50,5 +50,8 @@ "qrcode": "^1.5.4", "svelte-i18n": "^4.0.1", "svelte-maplibre": "^0.9.8" + }, + "overrides": { + "esbuild": "^0.25.0" } }