Skip to content

Commit 2ccf057

Browse files
Merge pull request #93 from cert-manager/self-upgrade-main
[CI] Merge self-upgrade-main into main
2 parents 2fb6d1a + 5cc334d commit 2ccf057

File tree

7 files changed

+17
-166
lines changed

7 files changed

+17
-166
lines changed

.github/chainguard/renovate.sts.yaml

Lines changed: 0 additions & 14 deletions
This file was deleted.

.github/workflows/renovate.yaml

Lines changed: 0 additions & 62 deletions
This file was deleted.

klone.yaml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -10,45 +10,45 @@ targets:
1010
- folder_name: boilerplate
1111
repo_url: https://github.com/cert-manager/makefile-modules.git
1212
repo_ref: main
13-
repo_hash: 1014370eb8a7a4451274858a94a155621f283ced
13+
repo_hash: f6bb544c8e92569f7de15f79dfe7037931b541b7
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: 1014370eb8a7a4451274858a94a155621f283ced
18+
repo_hash: f6bb544c8e92569f7de15f79dfe7037931b541b7
1919
repo_path: modules/cert-manager
2020
- folder_name: executable
2121
repo_url: https://github.com/cert-manager/makefile-modules.git
2222
repo_ref: main
23-
repo_hash: 1014370eb8a7a4451274858a94a155621f283ced
23+
repo_hash: f6bb544c8e92569f7de15f79dfe7037931b541b7
2424
repo_path: modules/executable
2525
- folder_name: generate-verify
2626
repo_url: https://github.com/cert-manager/makefile-modules.git
2727
repo_ref: main
28-
repo_hash: 1014370eb8a7a4451274858a94a155621f283ced
28+
repo_hash: f6bb544c8e92569f7de15f79dfe7037931b541b7
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: 1014370eb8a7a4451274858a94a155621f283ced
33+
repo_hash: f6bb544c8e92569f7de15f79dfe7037931b541b7
3434
repo_path: modules/go
3535
- folder_name: help
3636
repo_url: https://github.com/cert-manager/makefile-modules.git
3737
repo_ref: main
38-
repo_hash: 1014370eb8a7a4451274858a94a155621f283ced
38+
repo_hash: f6bb544c8e92569f7de15f79dfe7037931b541b7
3939
repo_path: modules/help
4040
- folder_name: klone
4141
repo_url: https://github.com/cert-manager/makefile-modules.git
4242
repo_ref: main
43-
repo_hash: 1014370eb8a7a4451274858a94a155621f283ced
43+
repo_hash: f6bb544c8e92569f7de15f79dfe7037931b541b7
4444
repo_path: modules/klone
4545
- folder_name: repository-base
4646
repo_url: https://github.com/cert-manager/makefile-modules.git
4747
repo_ref: main
48-
repo_hash: 1014370eb8a7a4451274858a94a155621f283ced
48+
repo_hash: f6bb544c8e92569f7de15f79dfe7037931b541b7
4949
repo_path: modules/repository-base
5050
- folder_name: tools
5151
repo_url: https://github.com/cert-manager/makefile-modules.git
5252
repo_ref: main
53-
repo_hash: 1014370eb8a7a4451274858a94a155621f283ced
53+
repo_hash: f6bb544c8e92569f7de15f79dfe7037931b541b7
5454
repo_path: modules/tools

make/_shared/repository-base/01_mod.mk

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,4 +33,7 @@ generate-base:
3333
cp $(_repository_base_module_dir)/renovate-bootstrap-config.json5 ./.github/renovate.json5; \
3434
fi
3535

36+
# TODO(erikgb): Remove the following command when all Renovate workflow files are gone
37+
rm -f ./.github/chainguard/renovate.sts.yaml ./.github/workflows/renovate.yaml
38+
3639
shared_generate_targets += generate-base

make/_shared/repository-base/base/.github/chainguard/renovate.sts.yaml

Lines changed: 0 additions & 14 deletions
This file was deleted.

make/_shared/repository-base/base/.github/workflows/renovate.yaml

Lines changed: 0 additions & 62 deletions
This file was deleted.

make/_shared/tools/00_mod.mk

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ tools += yq=v4.49.2
9090
tools += ko=0.18.0
9191
# https://github.com/protocolbuffers/protobuf/releases
9292
# renovate: datasource=github-releases packageName=protocolbuffers/protobuf
93-
tools += protoc=v33.1
93+
tools += protoc=v33.2
9494
# https://github.com/aquasecurity/trivy/releases
9595
# renovate: datasource=github-releases packageName=aquasecurity/trivy
9696
tools += trivy=v0.68.1
@@ -612,10 +612,10 @@ $(DOWNLOAD_DIR)/tools/ko@$(KO_VERSION)_$(HOST_OS)_$(HOST_ARCH): | $(DOWNLOAD_DIR
612612
chmod +x $(outfile); \
613613
rm -f $(outfile).tar.gz
614614

615-
protoc_linux_amd64_SHA256SUM=f3340e28a83d1c637d8bafdeed92b9f7db6a384c26bca880a6e5217b40a4328b
616-
protoc_linux_arm64_SHA256SUM=6018147740548e0e0f764408c87f4cd040e6e1c1203e13aeacaf811892b604f3
617-
protoc_darwin_amd64_SHA256SUM=e20b5f930e886da85e7402776a4959efb1ed60c57e72794bcade765e67abaa82
618-
protoc_darwin_arm64_SHA256SUM=db7e66ff7f9080614d0f5505a6b0ac488cf89a15621b6a361672d1332ec2e14e
615+
protoc_linux_amd64_SHA256SUM=b24b53f87c151bfd48b112fe4c3a6e6574e5198874f38036aff41df3456b8caf
616+
protoc_linux_arm64_SHA256SUM=706662a332683aa2fffe1c4ea61588279d31679cd42d91c7d60a69651768edb8
617+
protoc_darwin_amd64_SHA256SUM=dba51cfcc85076d56e7de01a647865c5a7f995c3dce427d5215b53e50b7be43f
618+
protoc_darwin_arm64_SHA256SUM=5be1427127788c9f7dd7d606c3e69843dd3587327dea993917ffcb77e7234b44
619619

620620
.PRECIOUS: $(DOWNLOAD_DIR)/tools/protoc@$(PROTOC_VERSION)_$(HOST_OS)_$(HOST_ARCH)
621621
$(DOWNLOAD_DIR)/tools/protoc@$(PROTOC_VERSION)_$(HOST_OS)_$(HOST_ARCH): | $(DOWNLOAD_DIR)/tools

0 commit comments

Comments
 (0)