Merge pull request #599 from apigee/gh_fixes1

Gh fixes1
apigee · Dec 5, 2024 · a1e93bc · a1e93bc
2 parents 71401b4 + 78f796b
commit a1e93bc
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 5 deletions.
diff --git 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

diff --git 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"