Skip to content

Commit ba24811

Browse files
authored
Merge branch 'main' into aea-5986-allow-semantic-release-pypi-to-handle-build
2 parents f1bee4f + 91d5906 commit ba24811

3 files changed

Lines changed: 9 additions & 14 deletions

File tree

.github/workflows/quality-checks.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -263,7 +263,7 @@ jobs:
263263
path: sbom.cdx.json
264264

265265
- name: Check python vulnerabilities
266-
if: ${{ steps.check_languages.outputs.uses_poetry == 'true' }}
266+
if: ${{ always() && steps.check_languages.outputs.uses_poetry == 'true'}}
267267
uses: aquasecurity/trivy-action@97e0b3872f55f89b95b2f65b3dbab56962816478
268268
with:
269269
scan-type: "fs"
@@ -276,7 +276,7 @@ jobs:
276276
exit-code: "1"
277277
trivy-config: trivy.yaml
278278
- name: Check node vulnerabilities
279-
if: ${{ steps.check_languages.outputs.uses_node == 'true' }}
279+
if: ${{ always() && steps.check_languages.outputs.uses_node == 'true' }}
280280
uses: aquasecurity/trivy-action@97e0b3872f55f89b95b2f65b3dbab56962816478
281281
with:
282282
scan-type: "fs"
@@ -289,7 +289,7 @@ jobs:
289289
exit-code: "1"
290290
trivy-config: trivy.yaml
291291
- name: Check go vulnerabilities
292-
if: ${{ steps.check_languages.outputs.uses_go == 'true' }}
292+
if: ${{ always() && steps.check_languages.outputs.uses_go == 'true' }}
293293
uses: aquasecurity/trivy-action@97e0b3872f55f89b95b2f65b3dbab56962816478
294294
with:
295295
scan-type: "fs"
@@ -301,7 +301,7 @@ jobs:
301301
output: "dependency_results_go.txt"
302302
exit-code: "1"
303303
- name: Check java vulnerabilities
304-
if: ${{ steps.check_languages.outputs.uses_java == 'true' }}
304+
if: ${{ always() && steps.check_languages.outputs.uses_java == 'true' }}
305305
uses: aquasecurity/trivy-action@97e0b3872f55f89b95b2f65b3dbab56962816478
306306
with:
307307
scan-type: "fs"

package-lock.json

Lines changed: 4 additions & 9 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
"@semantic-release/commit-analyzer": "^13.0.1",
1818
"@semantic-release/github": "^12.0.6",
1919
"@semantic-release/release-notes-generator": "^14.1.0",
20-
"conventional-changelog-eslint": "^6.0.0",
20+
"conventional-changelog-eslint": "^6.1.0",
2121
"semantic-release": "^25.0.3",
2222
"semantic-release-pypi": "^5.1.3"
2323
}

0 commit comments

Comments
 (0)