Skip to content

Commit 4bd7501

Browse files
authored
Merge branch 'main' into fix/mirror-kube-version-comment
2 parents aed801d + c0aead3 commit 4bd7501

2 files changed

Lines changed: 7 additions & 4 deletions

File tree

.settings.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
# Build Tools
2020
build_tools:
2121
# renovate: datasource=github-releases depName=goreleaser/goreleaser depType=build_tools
22-
goreleaser: 'v2.17.1'
22+
goreleaser: 'v2.18.0'
2323
# renovate: datasource=github-releases depName=ko-build/ko depType=build_tools
2424
ko: 'v0.19.1'
2525
# renovate: datasource=github-releases depName=google/go-containerregistry depType=build_tools
@@ -61,8 +61,8 @@ security_tools:
6161
#
6262
# Stored WITHOUT the leading 'v', unlike cosign/syft/grype above:
6363
# oras-project/setup-oras looks the version up against bare release keys and
64-
# throws on 'v1.3.0'. tools/setup-tools re-adds the prefix for the download URL.
65-
oras: '1.3.0'
64+
# throws on 'v1.3.3'. tools/setup-tools re-adds the prefix for the download URL.
65+
oras: '1.3.3'
6666

6767
# E2E Testing Tools
6868
testing_tools:

tools/setup-tools

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -378,7 +378,10 @@ if [[ "${SKIP_TOOLS}" == "false" ]]; then
378378
echo "════════════════════════════════════════════════════════"
379379

380380
GRYPE_INSTALL_SHA256=${GRYPE_INSTALL_SHA256:-"8646f06a90b10ca64992c1809b4aa00c44e30b4f551f63c309b0b0ab66873556"}
381-
GOLANGCI_LINT_INSTALL_SHA256=${GOLANGCI_LINT_INSTALL_SHA256:-"d32d3534af96cfd59546a084d22b213e8a47541cada5013aa8a84c4fa2589905"}
381+
# install.sh is fetched from the golangci-lint tag in .settings.yaml, so this
382+
# hash is version-specific: re-pin it whenever linting.golangci_lint is bumped.
383+
# curl -fsSL "https://raw.githubusercontent.com/golangci/golangci-lint/$(yq '.linting.golangci_lint' .settings.yaml)/install.sh" | shasum -a 256
384+
GOLANGCI_LINT_INSTALL_SHA256=${GOLANGCI_LINT_INSTALL_SHA256:-"1022ddb4d87ed252350ed03fc9677e250a4ae95cc6bcd4658c2a20a8a23d390f"}
382385

383386
if command_exists helm && [[ "${UPGRADE}" != "true" ]]; then
384387
log_success "Helm already installed: $(helm version --short)"

0 commit comments

Comments
 (0)