Skip to content

Commit

Permalink
Dep updates (#1297)
Browse files Browse the repository at this point in the history
## Type of change

- [ ] Bug fix (non-breaking change which fixes an issue)
- [ ] New feature (non-breaking change which adds functionality)
- [x] Other (security config, docs update, etc)

## Checklist before merging

- [x] Test, docs, adr added or updated as needed
- [x] [Contributor Guide
Steps](https://github.com/defenseunicorns/zarf/blob/main/CONTRIBUTING.md#developer-workflow)
followed
  • Loading branch information
jeff-mccoy authored Jan 30, 2023
1 parent d631e04 commit 22fada5
Show file tree
Hide file tree
Showing 20 changed files with 4,318 additions and 8,916 deletions.
2 changes: 1 addition & 1 deletion .github/actions/node/action.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,5 @@ runs:
steps:
- uses: actions/setup-node@v3
with:
node-version: 16
node-version: 18
cache: "npm"
1 change: 1 addition & 0 deletions .github/codeql.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ paths-ignore:
- src/pkg/packager/network.go
- src/pkg/utils/network.go
- src/pkg/utils/credentials.go
- docs-website/**
- build/**

query-filters:
Expand Down
3 changes: 2 additions & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,7 @@ jobs:
- name: Run Tests
run: |
sudo env "PATH=$PATH" CI=true APPLIANCE_MODE=true make test-e2e ARCH=amd64
sudo rm -rf zarf-sbom
sudo chown $USER /tmp/zarf-*.log
- name: Save logs
Expand All @@ -70,7 +71,7 @@ jobs:

# Set up AWS credentials for GoReleaser to upload backups of artifacts to S3
- name: Set AWS Credentials
uses: aws-actions/configure-aws-credentials@v1
uses: aws-actions/configure-aws-credentials@v1-node16
with:
aws-access-key-id: ${{ secrets.AWS_GOV_ACCESS_KEY_ID }}
aws-secret-access-key: ${{ secrets.AWS_GOV_SECRET_ACCESS_KEY }}
Expand Down
3 changes: 3 additions & 0 deletions .github/workflows/scan-codeql.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,9 @@ jobs:
- name: Setup golang
uses: ./.github/actions/golang

- name: Setup NodeJS
uses: ./.github/actions/node

# Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL
uses: github/codeql-action/init@v2
Expand Down
5 changes: 4 additions & 1 deletion .github/workflows/test-ui.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,9 +39,12 @@ jobs:
- name: Cache browsers
uses: actions/cache@v3
with:
path: "~/Library/Caches/ms-playwright/"
path: "~/.cache/ms-playwright/"
key: ${{ runner.os }}-browsers

- name: Ensure playright is installed
run: npx playwright install

- name: Run UI tests
run: >
npm run test:pre-init &&
Expand Down
3 changes: 3 additions & 0 deletions .grype.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,3 +16,6 @@ ignore:

# From yargs - only used through quicktype as a dev dependency
- vulnerability: GHSA-p9pc-299p-vxgp

# Grype being stupid again, https://nvd.nist.gov/vuln/detail/CVE-2018-25076 is a php vulnerability 🤦
- vulnerability: CVE-2018-25076
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -179,10 +179,10 @@ test-docs-and-schema:

# INTERNAL: used to test for new CVEs that may have been introduced
test-cves: ensure-ui-build-dir
go run main.go tools sbom packages . -o json | grype --fail-on low
go run main.go tools sbom packages . -o json --exclude './docs-website' | grype --fail-on low

cve-report: ensure-ui-build-dir ## Create a CVE report for the current project (must `brew install grype` first)
go run main.go tools sbom packages . -o json | grype -o template -t hack/grype.tmpl > build/zarf-known-cves.csv
go run main.go tools sbom packages . -o json --exclude './docs-website' | grype -o template -t hack/grype.tmpl > build/zarf-known-cves.csv

lint-go: ## Run revive to lint the go code (must `brew install revive` first)
revive -config revive.toml -exclude src/cmd/viper.go -formatter stylish ./src/...
10 changes: 0 additions & 10 deletions docs-website/.eslintignore

This file was deleted.

98 changes: 0 additions & 98 deletions docs-website/.eslintrc

This file was deleted.

8 changes: 0 additions & 8 deletions docs-website/.prettierignore

This file was deleted.

9 changes: 0 additions & 9 deletions docs-website/.prettierrc

This file was deleted.

25 changes: 0 additions & 25 deletions docs-website/.stylelintrc.json

This file was deleted.

Loading

0 comments on commit 22fada5

Please sign in to comment.