Skip to content

Commit d39c8b0

Browse files
cert-manager-prow[bot]cert-manager-prow[bot]
authored
Merge pull request #112 from cert-manager/self-upgrade-main
[CI] Merge self-upgrade-main into main
2 parents 9953060 + fd96e55 commit d39c8b0

File tree

9 files changed

+35
-20
lines changed

9 files changed

+35
-20
lines changed

‎Makefile‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,10 @@ FORCE:
4848

4949
noop: # do nothing
5050

51+
# Set empty value for MAKECMDGOALS to prevent the "warning: undefined variable 'MAKECMDGOALS'"
52+
# warning from happening when running make without arguments
53+
MAKECMDGOALS ?=
54+
5155
##################################
5256
# Host OS and architecture setup #
5357
##################################

‎klone.yaml‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -9,60 +9,60 @@ targets:
99
- folder_name: api-docs
1010
repo_url: https://github.com/cert-manager/makefile-modules.git
1111
repo_ref: main
12-
repo_hash: ad721163bbe8d8d755d54c88a2b2475aeb7c79de
12+
repo_hash: 9b0502fdd5860b18fd6a9ddf86f148604a214fe4
1313
repo_path: modules/api-docs
1414
- folder_name: boilerplate
1515
repo_url: https://github.com/cert-manager/makefile-modules.git
1616
repo_ref: main
17-
repo_hash: ad721163bbe8d8d755d54c88a2b2475aeb7c79de
17+
repo_hash: 9b0502fdd5860b18fd6a9ddf86f148604a214fe4
1818
repo_path: modules/boilerplate
1919
- folder_name: cert-manager
2020
repo_url: https://github.com/cert-manager/makefile-modules.git
2121
repo_ref: main
22-
repo_hash: ad721163bbe8d8d755d54c88a2b2475aeb7c79de
22+
repo_hash: 9b0502fdd5860b18fd6a9ddf86f148604a214fe4
2323
repo_path: modules/cert-manager
2424
- folder_name: controller-gen
2525
repo_url: https://github.com/cert-manager/makefile-modules.git
2626
repo_ref: main
27-
repo_hash: ad721163bbe8d8d755d54c88a2b2475aeb7c79de
27+
repo_hash: 9b0502fdd5860b18fd6a9ddf86f148604a214fe4
2828
repo_path: modules/controller-gen
2929
- folder_name: generate-verify
3030
repo_url: https://github.com/cert-manager/makefile-modules.git
3131
repo_ref: main
32-
repo_hash: ad721163bbe8d8d755d54c88a2b2475aeb7c79de
32+
repo_hash: 9b0502fdd5860b18fd6a9ddf86f148604a214fe4
3333
repo_path: modules/generate-verify
3434
- folder_name: go
3535
repo_url: https://github.com/cert-manager/makefile-modules.git
3636
repo_ref: main
37-
repo_hash: ad721163bbe8d8d755d54c88a2b2475aeb7c79de
37+
repo_hash: 9b0502fdd5860b18fd6a9ddf86f148604a214fe4
3838
repo_path: modules/go
3939
- folder_name: help
4040
repo_url: https://github.com/cert-manager/makefile-modules.git
4141
repo_ref: main
42-
repo_hash: ad721163bbe8d8d755d54c88a2b2475aeb7c79de
42+
repo_hash: 9b0502fdd5860b18fd6a9ddf86f148604a214fe4
4343
repo_path: modules/help
4444
- folder_name: kind
4545
repo_url: https://github.com/cert-manager/makefile-modules.git
4646
repo_ref: main
47-
repo_hash: ad721163bbe8d8d755d54c88a2b2475aeb7c79de
47+
repo_hash: 9b0502fdd5860b18fd6a9ddf86f148604a214fe4
4848
repo_path: modules/kind
4949
- folder_name: klone
5050
repo_url: https://github.com/cert-manager/makefile-modules.git
5151
repo_ref: main
52-
repo_hash: ad721163bbe8d8d755d54c88a2b2475aeb7c79de
52+
repo_hash: 9b0502fdd5860b18fd6a9ddf86f148604a214fe4
5353
repo_path: modules/klone
5454
- folder_name: oci-build
5555
repo_url: https://github.com/cert-manager/makefile-modules.git
5656
repo_ref: main
57-
repo_hash: ad721163bbe8d8d755d54c88a2b2475aeb7c79de
57+
repo_hash: 9b0502fdd5860b18fd6a9ddf86f148604a214fe4
5858
repo_path: modules/oci-build
5959
- folder_name: repository-base
6060
repo_url: https://github.com/cert-manager/makefile-modules.git
6161
repo_ref: main
62-
repo_hash: ad721163bbe8d8d755d54c88a2b2475aeb7c79de
62+
repo_hash: 9b0502fdd5860b18fd6a9ddf86f148604a214fe4
6363
repo_path: modules/repository-base
6464
- folder_name: tools
6565
repo_url: https://github.com/cert-manager/makefile-modules.git
6666
repo_ref: main
67-
repo_hash: ad721163bbe8d8d755d54c88a2b2475aeb7c79de
67+
repo_hash: 9b0502fdd5860b18fd6a9ddf86f148604a214fe4
6868
repo_path: modules/tools

‎make/_shared/generate-verify/util/verify.sh‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,7 @@ cleanup() {
4444
}
4545
trap "cleanup" EXIT SIGINT
4646

47-
cp -a "${projectdir}/." "${tmp}"
48-
rm -rf "${tmp}/_bin" # clear all cached files
47+
rsync -aEq "${projectdir}/." "${tmp}" --exclude "_bin/"
4948
pushd "${tmp}" >/dev/null
5049

5150
"$@"

‎make/_shared/help/help.sh‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,9 @@
1414
# See the License for the specific language governing permissions and
1515
# limitations under the License.
1616

17-
set -eu -o pipefail
17+
set -o errexit
18+
set -o nounset
19+
set -o pipefail
1820

1921
## 1. Build set of extracted line items
2022

‎make/_shared/repository-base/base/Makefile‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,10 @@ FORCE:
4848

4949
noop: # do nothing
5050

51+
# Set empty value for MAKECMDGOALS to prevent the "warning: undefined variable 'MAKECMDGOALS'"
52+
# warning from happening when running make without arguments
53+
MAKECMDGOALS ?=
54+
5155
##################################
5256
# Host OS and architecture setup #
5357
##################################

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -576,6 +576,7 @@ $(DOWNLOAD_DIR)/tools/rclone@$(RCLONE_VERSION)_$(HOST_OS)_$(HOST_ARCH): | $(DOWN
576576
MISSING=$(shell (command -v curl >/dev/null || echo curl) \
577577
&& (command -v sha256sum >/dev/null || command -v shasum >/dev/null || echo sha256sum) \
578578
&& (command -v git >/dev/null || echo git) \
579+
&& (command -v rsync >/dev/null || echo rsync) \
579580
&& ([ -n "$(findstring vendor-go,$(MAKECMDGOALS),)" ] \
580581
|| command -v $(GO) >/dev/null || echo "$(GO) (or run 'make vendor-go')") \
581582
&& (command -v $(CTR) >/dev/null || echo "$(CTR) (or set CTR to a docker-compatible tool)"))

‎make/_shared/tools/util/checkhash.sh‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,9 @@
1414
# See the License for the specific language governing permissions and
1515
# limitations under the License.
1616

17-
set -eu -o pipefail
17+
set -o errexit
18+
set -o nounset
19+
set -o pipefail
1820

1921
SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
2022

‎make/_shared/tools/util/hash.sh‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,9 @@
1414
# See the License for the specific language governing permissions and
1515
# limitations under the License.
1616

17-
set -eu -o pipefail
17+
set -o errexit
18+
set -o nounset
19+
set -o pipefail
1820

1921
# This script is a wrapper for outputting purely the sha256 hash of the input file,
2022
# ideally in a portable way.

‎make/_shared/tools/util/lock.sh‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,9 @@
1414
# See the License for the specific language governing permissions and
1515
# limitations under the License.
1616

17-
set -eu -o pipefail
17+
set -o errexit
18+
set -o nounset
19+
set -o pipefail
1820

1921
# This script is used to lock a file while it is being downloaded. It prevents
2022
# multiple processes from downloading the same file at the same time or from reading
@@ -66,6 +68,5 @@ finish() {
6668
rm -rf "$finalfile" || true
6769
fi
6870
rm -rf "$lockfile" || true
69-
exit $rv
7071
}
71-
trap finish EXIT
72+
trap finish EXIT SIGINT

0 commit comments

Comments
 (0)