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

Jump to bottom

Revert "Cache trivy DB (#475)" #477

Merged
merged 1 commit into from
Nov 22, 2024
Merged

Revert "Cache trivy DB (#475)" #477

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 2 additions & 1 deletion .github/workflows/integration_test.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -287,7 +287,8 @@ jobs:
exit-code: '1'
severity: ${{ inputs.trivy-severity-config }}
env:
TRIVY_SKIP_DB_UPDATE: true
TRIVY_USERNAME: ${{ github.actor }}
TRIVY_PASSWORD: ${{ secrets.GITHUB_TOKEN }}
- name: Check trivyignore
run: |
curl -sfL https://raw.githubusercontent.com/aquasecurity/trivy/main/contrib/install.sh | sh -s -- -b /usr/local/bin v0.46.0
Expand Down
6 changes: 2 additions & 4 deletions .github/workflows/integration_test_run.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -205,7 +205,7 @@ jobs:
- name: Restore Charmcraft Cache
if: inputs.charmcraft-repository != ''
id: restore-charmcraft
uses: actions/cache/restore@v4.1.2
uses: actions/cache/restore@v4
with:
path: ./charmcraft*.snap
key: charmcraft-${{ steps.charmcraft-sha.outputs.sha }}
Expand All @@ -219,7 +219,7 @@ jobs:
snapcraft --use-lxd
cp charmcraft*.snap ../
- name: Save Charmcraft Cache
uses: actions/cache/save@v4.1.2
uses: actions/cache/save@v4
if: steps.restore-charmcraft.outputs.cache-hit != 'true' && inputs.charmcraft-repository != ''
with:
path: ./charmcraft*.snap
Expand Down Expand Up @@ -331,8 +331,6 @@ jobs:
scan-type: "fs"
scan-ref: ${{ inputs.trivy-fs-ref }}
trivy-config: ${{ inputs.trivy-fs-config }}
env:
TRIVY_SKIP_DB_UPDATE: true
- name: Set Zap target env for Github Zap Action to Juju Unit IP Address
if: ${{ inputs.zap-enabled && inputs.zap-target == '' }}
run: echo "ZAP_TARGET=$(juju show-unit ${{ env.CHARM_NAME }}/0 --format=json | jq -r '.["${{ env.CHARM_NAME }}/0"]["address"]')" >> $GITHUB_ENV
Expand Down
Loading