Merge pull request #598 from apigee/issue597

chore: fixes to gh actions #597
apigee · Dec 5, 2024 · 71401b4 · 71401b4
2 parents c77a5c8 + e1dd7a4
commit 71401b4
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/.github/workflows/docker-publish.yml b/.github/workflows/docker-publish.yml
@@ -156,6 +156,11 @@ jobs:
           image-ref: '${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}@${{ steps.build-and-push.outputs.digest }}'
           format: 'sarif'
           output: 'trivy-results.sarif'
+          cache: 'true'
+          exit-code: 0
+        env:
+          TRIVY_SKIP_DB_UPDATE: true
+          TRIVY_SKIP_JAVA_DB_UPDATE: true
 
       - name: Upload Trivy apigeecli SARIF Report
         uses: github/codeql-action/upload-sarif@4f3212b61783c3c68e8309a0f18a699764811cda

diff --git a/.github/workflows/gen-docs.yml b/.github/workflows/gen-docs.yml
@@ -44,7 +44,7 @@ jobs:
 
           git fetch origin
           git checkout gh_pages
-          git reset --hard origin/main
+          git merge main
 
           GOBIN=/tmp/ go install github.com/google/go-licenses@v1.0.0
           /tmp/go-licenses csv ./cmd/apigeecli > third-party-licenses.txt || echo "Ignore warnings"