Skip to content

Commit 6fd1bd9

Browse files
committed
security ci fixes
1 parent a59e8a1 commit 6fd1bd9

1 file changed

Lines changed: 6 additions & 22 deletions

File tree

.github/workflows/ci-cd.yml

Lines changed: 6 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,9 @@ jobs:
4040
working-directory: frontend
4141
run: yarn build
4242

43+
- name: Generate changelog
44+
run: yarn --cwd frontend changelog && mv frontend/CHANGELOG.md CHANGELOG.md
45+
4346
- name: Cache frontend build
4447
uses: actions/cache@v4
4548
id: frontend-cache
@@ -104,19 +107,6 @@ jobs:
104107
name: backend-jar
105108
path: backend/build/libs/*.jar
106109

107-
- name: Setup Node.js for Changelog
108-
uses: actions/setup-node@v4
109-
with:
110-
node-version: '22'
111-
cache-dependency-path: 'frontend/yarn.lock'
112-
113-
- name: Install dependencies for Changelog
114-
working-directory: frontend
115-
run: yarn install --frozen-lockfile
116-
117-
- name: Generate changelog
118-
run: yarn --cwd frontend changelog && mv frontend/CHANGELOG.md CHANGELOG.md
119-
120110
security-scan:
121111
runs-on: ubuntu-latest
122112
needs: build-backend
@@ -125,19 +115,13 @@ jobs:
125115
- name: Checkout code
126116
uses: actions/checkout@v4
127117

128-
- name: Setup Trivy
118+
- name: Run Security Scan
129119
uses: aquasecurity/trivy-action@master
130120
with:
131121
scan-type: 'fs'
132122
scan-ref: '.'
133-
format: 'sarif'
134-
output: 'trivy-results.sarif'
135-
136-
- name: Upload Trivy scan results
137-
uses: github/codeql-action/upload-sarif@v2
138-
if: always()
139-
with:
140-
sarif_file: 'trivy-results.sarif'
123+
exit-code: '1'
124+
ignore-unfixed: true
141125

142126
build-and-push:
143127
runs-on: ubuntu-latest

0 commit comments

Comments
 (0)