From b1af3c4b02d3beb22a90be3a1d2c8a94763a5d71 Mon Sep 17 00:00:00 2001 From: srinandan Date: Thu, 5 Dec 2024 20:40:15 +0000 Subject: [PATCH 1/2] chore: undo env vars for trivy --- .github/workflows/docker-publish.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.github/workflows/docker-publish.yml b/.github/workflows/docker-publish.yml index bc2c3de7..de7771b4 100644 --- a/.github/workflows/docker-publish.yml +++ b/.github/workflows/docker-publish.yml @@ -158,9 +158,6 @@ jobs: 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 From 78f796bbad09b32600a862ba415e0200a1d6803c Mon Sep 17 00:00:00 2001 From: srinandan Date: Thu, 5 Dec 2024 21:42:33 +0000 Subject: [PATCH 2/2] fetch only branches needed --- .github/workflows/gen-docs.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/gen-docs.yml b/.github/workflows/gen-docs.yml index 2be5c83e..9daa0da3 100644 --- a/.github/workflows/gen-docs.yml +++ b/.github/workflows/gen-docs.yml @@ -42,9 +42,10 @@ jobs: git config --global user.name "$(git log -n 1 --pretty=format:%an)" git config --global user.email "$(git log -n 1 --pretty=format:%ae)" - git fetch origin + git fetch origin main + git fetch origin gh_pages git checkout gh_pages - git merge main + git merge origin/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"