Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Gh fixes1 #599

Merged
merged 2 commits into from
Dec 5, 2024
Merged

Gh fixes1 #599

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b1af3c4
chore: undo env vars for trivy
srinandan Dec 5, 2024
78f796b
fetch only branches needed
srinandan Dec 5, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions .github/workflows/docker-publish.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
5 changes: 3 additions & 2 deletions .github/workflows/gen-docs.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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/[email protected]
/tmp/go-licenses csv ./cmd/apigeecli > third-party-licenses.txt || echo "Ignore warnings"
Expand Down
Loading