Skip to content

Commit

Permalink
Merge branch 'main' into 1862-adr
Browse files Browse the repository at this point in the history
  • Loading branch information
cmwylie19 authored Jul 11, 2023
2 parents eb9a1ce + 49d41ee commit e748550
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 5 deletions.
2 changes: 0 additions & 2 deletions .github/actions/install-tools/action.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,6 @@ runs:
steps:
- uses: sigstore/cosign-installer@9becc617647dfa20ae7b1151972e9b3a2c338a2b # v2.8.1

- uses: anchore/sbom-action/download-syft@78fc58e266e87a38d4194b2137a3d4e9bcaf7ca1 # v0.14.3

- run: "curl -sSfL https://raw.githubusercontent.com/anchore/grype/main/install.sh | sh -s -- -b /usr/local/bin"
shell: bash

Expand Down
18 changes: 15 additions & 3 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,18 @@ jobs:
make release-init-package ARCH=amd64 AGENT_IMAGE_TAG=$GITHUB_REF_NAME
make release-init-package ARCH=arm64 AGENT_IMAGE_TAG=$GITHUB_REF_NAME
# Before we run the tests we need to aggressively cleanup files to reduce disk pressure
- name: Cleanup files
run: |
lsblk -f
sudo rm -rf zarf-sbom /tmp/zarf-* src/ui/node_modules
sudo build/zarf tools clear-cache
sudo docker system prune --all --force
go clean -cache
lsblk -f
- name: Run Tests
run: |
sudo env "PATH=$PATH" CI=true APPLIANCE_MODE=true make test-e2e ARCH=amd64
Expand All @@ -74,17 +86,17 @@ jobs:
- name: Create release time CVE report
run: "make cve-report"

# Before we run GoReleaser we need to aggressively cleanup files to reduce disk pressure
# Before we run GoReleaser we need to (again) aggressively cleanup files to reduce disk pressure
- name: Cleanup files
run: |
lsblk -f
sudo rm -rf zarf-sbom /tmp/zarf-* src/ui/node_modules
sudo rm -rf zarf-sbom /tmp/zarf-*
sudo env "PATH=$PATH" CI=true make delete-packages
sudo build/zarf tools clear-cache
sudo docker system prune --all --force
go clean -cache
lsblk -f
# Set up AWS credentials for GoReleaser to upload backups of artifacts to S3
Expand Down

0 comments on commit e748550

Please sign in to comment.