Skip to content

Commit

Permalink
Merge pull request #1592 from cert-manager/self-upgrade-master
Browse files Browse the repository at this point in the history
[CI] Merge self-upgrade-master into master
  • Loading branch information
cert-manager-prow[bot] authored Nov 19, 2024
2 parents 828c7df + cd61a3a commit 0c38322
Show file tree
Hide file tree
Showing 4 changed files with 14 additions and 14 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/make-self-upgrade.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ jobs:
echo "This workflow should not be run on a non-branch-head."
exit 1
- uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2

- id: go-version
run: |
Expand Down
12 changes: 6 additions & 6 deletions klone.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,30 +10,30 @@ targets:
- folder_name: boilerplate
repo_url: https://github.com/cert-manager/makefile-modules.git
repo_ref: main
repo_hash: f3e160d4854e9b522f0d4150d41ddac049b0b85a
repo_hash: c775b91913708e2ea4816373d0b0b4b632b3b524
repo_path: modules/boilerplate
- folder_name: generate-verify
repo_url: https://github.com/cert-manager/makefile-modules.git
repo_ref: main
repo_hash: f3e160d4854e9b522f0d4150d41ddac049b0b85a
repo_hash: c775b91913708e2ea4816373d0b0b4b632b3b524
repo_path: modules/generate-verify
- folder_name: help
repo_url: https://github.com/cert-manager/makefile-modules.git
repo_ref: main
repo_hash: f3e160d4854e9b522f0d4150d41ddac049b0b85a
repo_hash: c775b91913708e2ea4816373d0b0b4b632b3b524
repo_path: modules/help
- folder_name: klone
repo_url: https://github.com/cert-manager/makefile-modules.git
repo_ref: main
repo_hash: f3e160d4854e9b522f0d4150d41ddac049b0b85a
repo_hash: c775b91913708e2ea4816373d0b0b4b632b3b524
repo_path: modules/klone
- folder_name: repository-base
repo_url: https://github.com/cert-manager/makefile-modules.git
repo_ref: main
repo_hash: f3e160d4854e9b522f0d4150d41ddac049b0b85a
repo_hash: c775b91913708e2ea4816373d0b0b4b632b3b524
repo_path: modules/repository-base
- folder_name: tools
repo_url: https://github.com/cert-manager/makefile-modules.git
repo_ref: main
repo_hash: f3e160d4854e9b522f0d4150d41ddac049b0b85a
repo_hash: c775b91913708e2ea4816373d0b0b4b632b3b524
repo_path: modules/tools
Original file line number Diff line number Diff line change
Expand Up @@ -32,13 +32,13 @@ jobs:
echo "This workflow should not be run on a non-branch-head."
exit 1
- uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2

- id: go-version
run: |
make print-go-version >> "$GITHUB_OUTPUT"
- uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 # v5.0.2
- uses: actions/setup-go@41dfa10bad2bb2ae585af6ee5bb4d7d973ad74ed # v5.1.0
with:
go-version: ${{ steps.go-version.outputs.result }}

Expand Down
10 changes: 5 additions & 5 deletions make/_shared/tools/00_mod.mk
Original file line number Diff line number Diff line change
Expand Up @@ -159,7 +159,7 @@ ADDITIONAL_TOOLS ?=
tools += $(ADDITIONAL_TOOLS)

# https://go.dev/dl/
VENDORED_GO_VERSION := 1.23.2
VENDORED_GO_VERSION := 1.23.3

# Print the go version which can be used in GH actions
.PHONY: print-go-version
Expand Down Expand Up @@ -378,10 +378,10 @@ $(call for_each_kv,go_dependency,$(go_dependencies))
# File downloads #
##################

go_linux_amd64_SHA256SUM=542d3c1705f1c6a1c5a80d5dc62e2e45171af291e755d591c5e6531ef63b454e
go_linux_arm64_SHA256SUM=f626cdd92fc21a88b31c1251f419c17782933a42903db87a174ce74eeecc66a9
go_darwin_amd64_SHA256SUM=445c0ef19d8692283f4c3a92052cc0568f5a048f4e546105f58e991d4aea54f5
go_darwin_arm64_SHA256SUM=d87031194fe3e01abdcaf3c7302148ade97a7add6eac3fec26765bcb3207b80f
go_linux_amd64_SHA256SUM=a0afb9744c00648bafb1b90b4aba5bdb86f424f02f9275399ce0c20b93a2c3a8
go_linux_arm64_SHA256SUM=1f7cbd7f668ea32a107ecd41b6488aaee1f5d77a66efd885b175494439d4e1ce
go_darwin_amd64_SHA256SUM=c7e024d5c0bc81845070f23598caf02f05b8ae88fd4ad2cd3e236ddbea833ad2
go_darwin_arm64_SHA256SUM=31e119fe9bde6e105407a32558d5b5fa6ca11e2bd17f8b7b2f8a06aba16a0632

.PRECIOUS: $(DOWNLOAD_DIR)/tools/go@$(VENDORED_GO_VERSION)_$(HOST_OS)_$(HOST_ARCH).tar.gz
$(DOWNLOAD_DIR)/tools/go@$(VENDORED_GO_VERSION)_$(HOST_OS)_$(HOST_ARCH).tar.gz: | $(DOWNLOAD_DIR)/tools
Expand Down

0 comments on commit 0c38322

Please sign in to comment.