Skip to content

Commit 375d599

Browse files
committed
Merge remote-tracking branch 'refs/remotes/origin/main' into feat/add-mgmt-license-and-configmap
2 parents 4440c06 + fb9f6e4 commit 375d599

14 files changed

+4665
-3
lines changed

.pre-commit-config.yaml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ repos:
1717
- id: check-merge-conflict
1818
- id: check-shebang-scripts-are-executable
1919
- id: check-executables-have-shebangs
20+
exclude: '(\.snap)$'
2021
- id: check-symlinks
2122
- id: check-case-conflict
2223
- id: check-vcs-permalinks
@@ -77,7 +78,7 @@ repos:
7778
]
7879

7980
- repo: https://github.com/python-jsonschema/check-jsonschema
80-
rev: 0.29.4
81+
rev: 0.30.0
8182
hooks:
8283
- id: check-jsonschema
8384
name: "Check Helm Chart JSON Schema"

Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -71,11 +71,11 @@ staticcheck: ## Run staticcheck linter
7171

7272
.PHONY: test
7373
test: ## Run GoLang tests
74-
go test -tags=aws -shuffle=on -race -coverprofile=coverage.txt -covermode=atomic ./...
74+
go test -tags=aws,helmunit -shuffle=on -race -coverprofile=coverage.txt -covermode=atomic ./...
7575

7676
.PHONY: test-update-snaps
7777
test-update-snaps:
78-
UPDATE_SNAPS=true go test -tags=aws -shuffle=on -race ./...
78+
UPDATE_SNAPS=true go test -tags=aws,helmunit -shuffle=on -race ./...
7979

8080
cover: test ## Generate coverage report
8181

0 commit comments

Comments
 (0)