Skip to content

Commit 5d2f5fe

Browse files
lacksteinlackstein
committed
Merge in upstream v3.8.0
2 parents 23c947b + 70acba1 commit 5d2f5fe

File tree

14 files changed

+51
-55
lines changed

14 files changed

+51
-55
lines changed

‎.github/workflows/ci.yaml‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -13,15 +13,15 @@ jobs:
1313
steps:
1414

1515
- name: checkout
16-
uses: actions/checkout@24cb9080177205b6e8c946b17badbe402adc938f # v3
16+
uses: actions/checkout@8f4b7f84864484a7bf31766abe9204da3cbe65b3 # v3.5.0
1717
with:
1818
fetch-depth: 0
1919

2020
- name: shellcheck
2121
uses: ludeeus/action-shellcheck@00cae500b08a931fb5698e11e79bfbd38e612a38 # v2.0.0
2222

2323
- name: Setup go
24-
uses: actions/setup-go@4d34df0c2316fe8122ab82dc22947d607c0c91f9 # v3.3.0
24+
uses: actions/setup-go@4d34df0c2316fe8122ab82dc22947d607c0c91f9 # v4.0.0
2525
with:
2626
go-version-file: './go.mod'
2727
check-latest: true
@@ -36,15 +36,15 @@ jobs:
3636
sudo ln -s "/usr/local/helm-$helm_version/linux-amd64/helm" /usr/local/bin/helm
3737
3838
- name: Install GoReleaser
39-
uses: goreleaser/goreleaser-action@f82d6c1c344bcacabba2c841718984797f664a6b # v3.1.0
39+
uses: goreleaser/goreleaser-action@f82d6c1c344bcacabba2c841718984797f664a6b # v4.2.0
4040
with:
4141
install-only: true
4242

4343
- name: Install cosign
44-
uses: sigstore/cosign-installer@c3667d99424e7e6047999fb6246c0da843953c65 # v2.6.0
44+
uses: sigstore/cosign-installer@c3667d99424e7e6047999fb6246c0da843953c65 # v3.0.1
4545

4646
- name: Install syft
47-
uses: anchore/sbom-action/download-syft@448520c4f19577ffce70a8317e619089054687e3 # v0.13.4
47+
uses: anchore/sbom-action/download-syft@448520c4f19577ffce70a8317e619089054687e3 # v0.14.0
4848

4949
- name: Install k8s Kind
5050
uses: helm/kind-action@d8ccf8fb623ce1bb360ae2f45f323d9d5c5e9f00 # v1.3.0
@@ -71,10 +71,10 @@ jobs:
7171
git diff --exit-code
7272
7373
- name: Set up QEMU
74-
uses: docker/setup-qemu-action@e81a89b1732b9c48d79cd809d8d81d79c4647a18 # v2.0.0
74+
uses: docker/setup-qemu-action@e81a89b1732b9c48d79cd809d8d81d79c4647a18 # v2.1.0
7575

7676
- name: Set up Docker Buildx
77-
uses: docker/setup-buildx-action@4b4e9c3e2d4531116a6f8ba8e71fc6e2cb6e6c8c # v2.0.0
77+
uses: docker/setup-buildx-action@4b4e9c3e2d4531116a6f8ba8e71fc6e2cb6e6c8c # v2.5.0
7878

7979
- name: Build
8080
run: |
@@ -88,8 +88,8 @@ jobs:
8888
name: check-docs
8989
runs-on: ubuntu-latest
9090
steps:
91-
- uses: actions/checkout@24cb9080177205b6e8c946b17badbe402adc938f # v3
92-
- uses: actions/setup-go@4d34df0c2316fe8122ab82dc22947d607c0c91f9 # v3
91+
- uses: actions/checkout@8f4b7f84864484a7bf31766abe9204da3cbe65b3 # v3.5.0
92+
- uses: actions/setup-go@4d34df0c2316fe8122ab82dc22947d607c0c91f9 # v4.0.0
9393
with:
9494
go-version-file: './go.mod'
9595
check-latest: true
@@ -109,15 +109,15 @@ jobs:
109109
name: lint
110110
runs-on: ubuntu-latest
111111
steps:
112-
- uses: actions/checkout@24cb9080177205b6e8c946b17badbe402adc938f # v3
113-
- uses: actions/setup-go@4d34df0c2316fe8122ab82dc22947d607c0c91f9 # v3
112+
- uses: actions/checkout@8f4b7f84864484a7bf31766abe9204da3cbe65b3 # v3.5.0
113+
- uses: actions/setup-go@4d34df0c2316fe8122ab82dc22947d607c0c91f9 # v4.0.0
114114
with:
115115
go-version-file: './go.mod'
116116
check-latest: true
117117
- name: golangci-lint
118118
uses: golangci/golangci-lint-action@08e2f20817b15149a52b5b3ebe7de50aff2ba8c5 # v3
119119
with:
120-
version: v1.51.0
120+
version: v1.52.1
121121

122122
dependency-scan:
123123
name: dependency-scan

‎.github/workflows/release.yaml‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -17,29 +17,29 @@ jobs:
1717
steps:
1818

1919
- name: checkout
20-
uses: actions/checkout@24cb9080177205b6e8c946b17badbe402adc938f # v3.0.1
20+
uses: actions/checkout@8f4b7f84864484a7bf31766abe9204da3cbe65b3 # v3.5.0
2121
with:
2222
fetch-depth: 0
2323

2424
- name: shellcheck
2525
uses: ludeeus/action-shellcheck@00cae500b08a931fb5698e11e79bfbd38e612a38 # v2.0.0
2626

2727
- name: Setup go
28-
uses: actions/setup-go@4d34df0c2316fe8122ab82dc22947d607c0c91f9 # v3.3.0
28+
uses: actions/setup-go@4d34df0c2316fe8122ab82dc22947d607c0c91f9 # v4.0.0
2929
with:
3030
go-version-file: './go.mod'
3131
check-latest: true
3232

3333
- name: Install GoReleaser
34-
uses: goreleaser/goreleaser-action@f82d6c1c344bcacabba2c841718984797f664a6b # v3.1.0
34+
uses: goreleaser/goreleaser-action@f82d6c1c344bcacabba2c841718984797f664a6b # v4.2.0
3535
with:
3636
install-only: true
3737

3838
- name: Install cosign
39-
uses: sigstore/cosign-installer@c3667d99424e7e6047999fb6246c0da843953c65 # v2.6.0
39+
uses: sigstore/cosign-installer@c3667d99424e7e6047999fb6246c0da843953c65 # v3.0.1
4040

4141
- name: Install syft
42-
uses: anchore/sbom-action/download-syft@448520c4f19577ffce70a8317e619089054687e3 # v0.13.4
42+
uses: anchore/sbom-action/download-syft@448520c4f19577ffce70a8317e619089054687e3 # v0.14.0
4343

4444
- name: Install tools
4545
run: |
@@ -53,13 +53,13 @@ jobs:
5353
git diff --exit-code
5454
5555
- name: Set up QEMU
56-
uses: docker/setup-qemu-action@e81a89b1732b9c48d79cd809d8d81d79c4647a18 # v2.0.0
56+
uses: docker/setup-qemu-action@e81a89b1732b9c48d79cd809d8d81d79c4647a18 # v2.1.0
5757

5858
- name: Set up Docker Buildx
59-
uses: docker/setup-buildx-action@4b4e9c3e2d4531116a6f8ba8e71fc6e2cb6e6c8c # v2.0.0
59+
uses: docker/setup-buildx-action@4b4e9c3e2d4531116a6f8ba8e71fc6e2cb6e6c8c # v2.5.0
6060

6161
- name: Login to registry
62-
uses: docker/login-action@f4ef78c080cd8ba55a85445d5b36e214a81df20a # v2.0.0
62+
uses: docker/login-action@f4ef78c080cd8ba55a85445d5b36e214a81df20a # v2.1.0
6363
with:
6464
registry: quay.io
6565
username: ${{ secrets.DOCKER_USERNAME }}

‎.golangci.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ issues:
2424
linters:
2525
- errcheck
2626
- gosec
27+
- revive
2728
max-issues-per-linter: 0
2829
max-same-issues: 0
2930
run:

‎.goreleaser.yml‎

Lines changed: 15 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
project_name: chart-testing
22

33
env:
4-
- COSIGN_EXPERIMENTAL=true
4+
- COSIGN_YES=true
55

66
before:
77
hooks:
88
- go mod download
99

1010
sboms:
11-
- artifacts: archive
11+
- artifacts: archive
1212

1313
builds:
1414
- main: ct/main.go
@@ -33,7 +33,8 @@ builds:
3333
-X github.com/helm/chart-testing/v3/ct/cmd.BuildDate={{ .Date }}
3434
3535
archives:
36-
- format_overrides:
36+
- rlcp: true
37+
format_overrides:
3738
- goos: windows
3839
format: zip
3940
files:
@@ -92,14 +93,14 @@ dockers:
9293
- etc/lintconf.yaml
9394

9495
docker_manifests:
95-
- name_template: quay.io/fossa/chart-testing:latest
96-
image_templates:
97-
- quay.io/fossa/chart-testing:latest-amd64
98-
- quay.io/fossa/chart-testing:latest-arm64
99-
- name_template: quay.io/fossa/chart-testing:{{ .Tag }}
100-
image_templates:
101-
- quay.io/fossa/chart-testing:{{ .Tag }}-amd64
102-
- quay.io/fossa/chart-testing:{{ .Tag }}-arm64
96+
- name_template: quay.io/fossa/chart-testing:latest
97+
image_templates:
98+
- quay.io/fossa/chart-testing:latest-amd64
99+
- quay.io/fossa/chart-testing:latest-arm64
100+
- name_template: quay.io/fossa/chart-testing:{{ .Tag }}
101+
image_templates:
102+
- quay.io/fossa/chart-testing:{{ .Tag }}-amd64
103+
- quay.io/fossa/chart-testing:{{ .Tag }}-arm64
103104

104105
signs:
105106
- id: all
@@ -114,3 +115,6 @@ docker_signs:
114115
cmd: cosign
115116
args: ["sign", "${artifact}"]
116117
artifacts: manifests
118+
119+
changelog:
120+
use: github-native

‎Dockerfile‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,10 +42,11 @@ RUN targetArch=$(echo $TARGETPLATFORM | cut -f2 -d '/') \
4242
&& mkdir -p "/usr/local/helm-$helm_version" \
4343
&& tar -xzf "helm--$HELM_ARCH.tar.gz" -C "/usr/local/helm-$helm_version" \
4444
&& ln -s "/usr/local/helm-$helm_version/$HELM_ARCH/helm" /usr/local/bin/helm \
45-
&& rm -f "helm-$helm_version-$HELM_ARCH.tar.gz"
45+
&& rm -f "helm--$HELM_ARCH.tar.gz"
4646

4747
COPY ./etc/chart_schema.yaml /etc/ct/chart_schema.yaml
4848
COPY ./etc/lintconf.yaml /etc/ct/lintconf.yaml
4949
COPY ct /usr/local/bin/ct
50+
RUN git config --global --add safe.directory /workdir
5051
# Ensure that the binary is available on path and is executable
5152
RUN ct --help

‎build.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ main() {
5959
shift
6060
done
6161

62-
local goreleaser_args=(--rm-dist)
62+
local goreleaser_args=(--clean)
6363

6464
if [[ -n "$debug" ]]; then
6565
goreleaser_args+=(--debug)

‎ct/cmd/docGen.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ func newGenerateDocsCmd() *cobra.Command {
3434
}
3535
}
3636

37-
func generateDocs(cmd *cobra.Command, args []string) error {
37+
func generateDocs(_ *cobra.Command, _ []string) error {
3838
fmt.Println("Generating docs...")
3939

4040
err := doc.GenMarkdownTree(NewRootCmd(), "doc")

‎ct/cmd/install.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ func addInstallFlags(flags *flag.FlagSet) {
8484
Skip resources clean-up. Used if need to continue other flows or keep it around.`))
8585
}
8686

87-
func install(cmd *cobra.Command, args []string) error {
87+
func install(cmd *cobra.Command, _ []string) error {
8888
fmt.Println("Installing charts...")
8989

9090
printConfig, err := cmd.Flags().GetBool("print-config")

‎ct/cmd/lint.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ func addLintFlags(flags *flag.FlagSet) {
7676
Example: "helm unittest --helm3 -f tests/*.yaml {{ .Path }}"`))
7777
}
7878

79-
func lint(cmd *cobra.Command, args []string) error {
79+
func lint(cmd *cobra.Command, _ []string) error {
8080
fmt.Println("Linting charts...")
8181

8282
printConfig, err := cmd.Flags().GetBool("print-config")

‎ct/cmd/lintAndInstall.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ func newLintAndInstallCmd() *cobra.Command {
3939
return cmd
4040
}
4141

42-
func lintAndInstall(cmd *cobra.Command, args []string) error {
42+
func lintAndInstall(cmd *cobra.Command, _ []string) error {
4343
fmt.Println("Linting and installing charts...")
4444

4545
printConfig, err := cmd.Flags().GetBool("print-config")

0 commit comments

Comments
 (0)