Skip to content

Commit 9527899

Browse files
cert-manager-prow[bot]cert-manager-prow[bot]
authored
Merge pull request #787 from cert-manager/self-upgrade-main
[CI] Merge self-upgrade-main into main
2 parents 5783cbc + 7c8b9a0 commit 9527899

File tree

5 files changed

+22
-21
lines changed

5 files changed

+22
-21
lines changed

‎.golangci.yaml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,9 +77,10 @@ formatters:
7777
sections:
7878
- standard # Standard section: captures all standard packages.
7979
- default # Default section: contains all imports that could not be matched to another section type.
80-
- prefix(github.com/cert-manager/trust-manager) # Custom section: groups all imports with the specified Prefix.
80+
- localmodule # Local module section: contains all local packages. This section is not present unless explicitly enabled.
8181
- blank # Blank section: contains all blank imports. This section is not present unless explicitly enabled.
8282
- dot # Dot section: contains all dot imports. This section is not present unless explicitly enabled.
83+
custom-order: true
8384
exclusions:
8485
generated: lax
8586
paths: [third_party, builtin$, examples$]

‎klone.yaml‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -10,70 +10,70 @@ targets:
1010
- folder_name: boilerplate
1111
repo_url: https://github.com/cert-manager/makefile-modules.git
1212
repo_ref: main
13-
repo_hash: d226527d1c27589be8adaaddf8d591483bbc8c0b
13+
repo_hash: 2121d6bf1ec6440011bc03021015af1c18ec0eba
1414
repo_path: modules/boilerplate
1515
- folder_name: cert-manager
1616
repo_url: https://github.com/cert-manager/makefile-modules.git
1717
repo_ref: main
18-
repo_hash: d226527d1c27589be8adaaddf8d591483bbc8c0b
18+
repo_hash: 2121d6bf1ec6440011bc03021015af1c18ec0eba
1919
repo_path: modules/cert-manager
2020
- folder_name: controller-gen
2121
repo_url: https://github.com/cert-manager/makefile-modules.git
2222
repo_ref: main
23-
repo_hash: d226527d1c27589be8adaaddf8d591483bbc8c0b
23+
repo_hash: 2121d6bf1ec6440011bc03021015af1c18ec0eba
2424
repo_path: modules/controller-gen
2525
- folder_name: generate-verify
2626
repo_url: https://github.com/cert-manager/makefile-modules.git
2727
repo_ref: main
28-
repo_hash: d226527d1c27589be8adaaddf8d591483bbc8c0b
28+
repo_hash: 2121d6bf1ec6440011bc03021015af1c18ec0eba
2929
repo_path: modules/generate-verify
3030
- folder_name: go
3131
repo_url: https://github.com/cert-manager/makefile-modules.git
3232
repo_ref: main
33-
repo_hash: d226527d1c27589be8adaaddf8d591483bbc8c0b
33+
repo_hash: 2121d6bf1ec6440011bc03021015af1c18ec0eba
3434
repo_path: modules/go
3535
- folder_name: helm
3636
repo_url: https://github.com/cert-manager/makefile-modules.git
3737
repo_ref: main
38-
repo_hash: d226527d1c27589be8adaaddf8d591483bbc8c0b
38+
repo_hash: 2121d6bf1ec6440011bc03021015af1c18ec0eba
3939
repo_path: modules/helm
4040
- folder_name: help
4141
repo_url: https://github.com/cert-manager/makefile-modules.git
4242
repo_ref: main
43-
repo_hash: d226527d1c27589be8adaaddf8d591483bbc8c0b
43+
repo_hash: 2121d6bf1ec6440011bc03021015af1c18ec0eba
4444
repo_path: modules/help
4545
- folder_name: kind
4646
repo_url: https://github.com/cert-manager/makefile-modules.git
4747
repo_ref: main
48-
repo_hash: d226527d1c27589be8adaaddf8d591483bbc8c0b
48+
repo_hash: 2121d6bf1ec6440011bc03021015af1c18ec0eba
4949
repo_path: modules/kind
5050
- folder_name: klone
5151
repo_url: https://github.com/cert-manager/makefile-modules.git
5252
repo_ref: main
53-
repo_hash: d226527d1c27589be8adaaddf8d591483bbc8c0b
53+
repo_hash: 2121d6bf1ec6440011bc03021015af1c18ec0eba
5454
repo_path: modules/klone
5555
- folder_name: licenses
5656
repo_url: https://github.com/cert-manager/makefile-modules.git
5757
repo_ref: main
58-
repo_hash: d226527d1c27589be8adaaddf8d591483bbc8c0b
58+
repo_hash: 2121d6bf1ec6440011bc03021015af1c18ec0eba
5959
repo_path: modules/licenses
6060
- folder_name: oci-build
6161
repo_url: https://github.com/cert-manager/makefile-modules.git
6262
repo_ref: main
63-
repo_hash: d226527d1c27589be8adaaddf8d591483bbc8c0b
63+
repo_hash: 2121d6bf1ec6440011bc03021015af1c18ec0eba
6464
repo_path: modules/oci-build
6565
- folder_name: oci-publish
6666
repo_url: https://github.com/cert-manager/makefile-modules.git
6767
repo_ref: main
68-
repo_hash: d226527d1c27589be8adaaddf8d591483bbc8c0b
68+
repo_hash: 2121d6bf1ec6440011bc03021015af1c18ec0eba
6969
repo_path: modules/oci-publish
7070
- folder_name: repository-base
7171
repo_url: https://github.com/cert-manager/makefile-modules.git
7272
repo_ref: main
73-
repo_hash: d226527d1c27589be8adaaddf8d591483bbc8c0b
73+
repo_hash: 2121d6bf1ec6440011bc03021015af1c18ec0eba
7474
repo_path: modules/repository-base
7575
- folder_name: tools
7676
repo_url: https://github.com/cert-manager/makefile-modules.git
7777
repo_ref: main
78-
repo_hash: d226527d1c27589be8adaaddf8d591483bbc8c0b
78+
repo_hash: 2121d6bf1ec6440011bc03021015af1c18ec0eba
7979
repo_path: modules/tools

‎make/_shared/go/.golangci.override.yaml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,10 +70,11 @@ formatters:
7070
enable: [ gci, gofmt ]
7171
settings:
7272
gci:
73+
custom-order: true
7374
sections:
7475
- standard # Standard section: captures all standard packages.
7576
- default # Default section: contains all imports that could not be matched to another section type.
76-
- prefix({{REPO-NAME}}) # Custom section: groups all imports with the specified Prefix.
77+
- localmodule # Local module section: contains all local packages. This section is not present unless explicitly enabled.
7778
- blank # Blank section: contains all blank imports. This section is not present unless explicitly enabled.
7879
- dot # Dot section: contains all dot imports. This section is not present unless explicitly enabled.
7980
exclusions:

‎make/_shared/go/01_mod.mk‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,6 @@ generate-golangci-lint-config: | $(NEEDS_GOLANGCI-LINT) $(NEEDS_YQ) $(bin_dir)/s
117117
cp $(golangci_lint_config) $(bin_dir)/scratch/golangci-lint.yaml.tmp
118118
$(YQ) -i 'del(.linters.enable)' $(bin_dir)/scratch/golangci-lint.yaml.tmp
119119
$(YQ) eval-all -i '. as $$item ireduce ({}; . * $$item)' $(bin_dir)/scratch/golangci-lint.yaml.tmp $(golangci_lint_override)
120-
$(YQ) -i '(.. | select(tag == "!!str")) |= sub("{{REPO-NAME}}", "$(repo_name)")' $(bin_dir)/scratch/golangci-lint.yaml.tmp
121120
mv $(bin_dir)/scratch/golangci-lint.yaml.tmp $(golangci_lint_config)
122121

123122
shared_generate_targets += generate-golangci-lint-config
@@ -147,9 +146,9 @@ fix-golangci-lint: | $(NEEDS_GOLANGCI-LINT) $(NEEDS_YQ) $(NEEDS_GCI) $(bin_dir)/
147146
@find . -name go.mod -not \( -path "./$(bin_dir)/*" -or -path "./make/_shared/*" \) \
148147
| while read d; do \
149148
target=$$(dirname $${d}); \
150-
echo "Running 'GOVERSION=$(VENDORED_GO_VERSION) $(bin_dir)/tools/golangci-lint fmt -c $(CURDIR)/$(golangci_lint_config)' in directory '$${target}'"; \
149+
echo "Running 'GOVERSION=$(VENDORED_GO_VERSION) $(bin_dir)/tools/golangci-lint run --fix -c $(CURDIR)/$(golangci_lint_config) --timeout $(golangci_lint_timeout)' in directory '$${target}'"; \
151150
pushd "$${target}" >/dev/null; \
152-
GOVERSION=$(VENDORED_GO_VERSION) $(GOLANGCI-LINT) fmt -c $(CURDIR)/$(golangci_lint_config) || exit; \
151+
GOVERSION=$(VENDORED_GO_VERSION) $(GOLANGCI-LINT) run --fix -c $(CURDIR)/$(golangci_lint_config) --timeout $(golangci_lint_timeout) || exit; \
153152
popd >/dev/null; \
154153
echo ""; \
155154
done

‎make/_shared/tools/00_mod.mk‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -499,7 +499,7 @@ $(DOWNLOAD_DIR)/tools/vault@$(VAULT_VERSION)_$(HOST_OS)_$(HOST_ARCH): | $(DOWNLO
499499
@source $(lock_script) $@; \
500500
$(CURL) https://releases.hashicorp.com/vault/$(VAULT_VERSION:v%=%)/vault_$(VAULT_VERSION:v%=%)_$(HOST_OS)_$(HOST_ARCH).zip -o $(outfile).zip; \
501501
$(checkhash_script) $(outfile).zip $(vault_$(HOST_OS)_$(HOST_ARCH)_SHA256SUM); \
502-
unzip -qq -c $(outfile).zip > $(outfile); \
502+
unzip -p $(outfile).zip vault > $(outfile); \
503503
chmod +x $(outfile); \
504504
rm -f $(outfile).zip
505505

@@ -593,7 +593,7 @@ $(DOWNLOAD_DIR)/tools/protoc@$(PROTOC_VERSION)_$(HOST_OS)_$(HOST_ARCH): | $(DOWN
593593
@source $(lock_script) $@; \
594594
$(CURL) https://github.com/protocolbuffers/protobuf/releases/download/$(PROTOC_VERSION)/protoc-$(PROTOC_VERSION:v%=%)-$(OS)-$(ARCH).zip -o $(outfile).zip; \
595595
$(checkhash_script) $(outfile).zip $(protoc_$(HOST_OS)_$(HOST_ARCH)_SHA256SUM); \
596-
unzip -qq -c $(outfile).zip bin/protoc > $(outfile); \
596+
unzip -p $(outfile).zip bin/protoc > $(outfile); \
597597
chmod +x $(outfile); \
598598
rm -f $(outfile).zip
599599

0 commit comments

Comments
 (0)