Merge branch 'main' into renovate/all-minor-patch

bcgov · Jun 12, 2024 · 0ceb2c7 · 0ceb2c7
2 parents cc0bc7a + e63a394
commit 0ceb2c7
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/.github/workflows/analysis.yml b/.github/workflows/analysis.yml
@@ -24,7 +24,7 @@ jobs:
       - uses: actions/checkout@v4
 
       - name: Run Trivy vulnerability scanner in repo mode
-        uses: aquasecurity/trivy-action@0.19.0
+        uses: aquasecurity/trivy-action@0.22.0
         with:
           format: "sarif"
           output: "trivy-results.sarif"

diff --git a/.github/workflows/merge.yml b/.github/workflows/merge.yml
@@ -21,7 +21,7 @@ jobs:
     steps:
       - uses: actions/checkout@v4
       - name: Conventional Changelog Update
-        uses: TriPSs/conventional-changelog-action@v5.2.1
+        uses: TriPSs/conventional-changelog-action@v5.3.0
         id: changelog
         with:
           github-token: ${{ github.token }}