Skip to content

Commit 88a40ce

Browse files
Merge pull request #1579 from cert-manager/self-upgrade-master
[CI] Merge self-upgrade-master into master
2 parents 9dbf33f + 7bb18e2 commit 88a40ce

File tree

6 files changed

+15
-11
lines changed

6 files changed

+15
-11
lines changed

.github/dependabot.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# THIS FILE IS AUTOMATICALLY GENERATED. DO NOT EDIT.
2-
# Edit https://github.com/cert-manager/makefile-modules/blob/main/modules/repository-base/base/.github/dependabot.yaml instead.
2+
# Edit https://github.com/cert-manager/makefile-modules/blob/main/modules/repository-base/base-dependabot/.github/dependabot.yaml instead.
33

44
# Update Go dependencies and GitHub Actions dependencies daily.
55
version: 2

.github/workflows/make-self-upgrade.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ jobs:
3232
echo "This workflow should not be run on a non-branch-head."
3333
exit 1
3434
35-
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
35+
- uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
3636

3737
- id: go-version
3838
run: |

klone.yaml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,30 +10,30 @@ targets:
1010
- folder_name: boilerplate
1111
repo_url: https://github.com/cert-manager/makefile-modules.git
1212
repo_ref: main
13-
repo_hash: 279334d152866c753421232cf237dab891fbaf5f
13+
repo_hash: 43af254fa25ae30453a9ffe63cd37feab130917c
1414
repo_path: modules/boilerplate
1515
- folder_name: generate-verify
1616
repo_url: https://github.com/cert-manager/makefile-modules.git
1717
repo_ref: main
18-
repo_hash: 279334d152866c753421232cf237dab891fbaf5f
18+
repo_hash: 43af254fa25ae30453a9ffe63cd37feab130917c
1919
repo_path: modules/generate-verify
2020
- folder_name: help
2121
repo_url: https://github.com/cert-manager/makefile-modules.git
2222
repo_ref: main
23-
repo_hash: 279334d152866c753421232cf237dab891fbaf5f
23+
repo_hash: 43af254fa25ae30453a9ffe63cd37feab130917c
2424
repo_path: modules/help
2525
- folder_name: klone
2626
repo_url: https://github.com/cert-manager/makefile-modules.git
2727
repo_ref: main
28-
repo_hash: 279334d152866c753421232cf237dab891fbaf5f
28+
repo_hash: 43af254fa25ae30453a9ffe63cd37feab130917c
2929
repo_path: modules/klone
3030
- folder_name: repository-base
3131
repo_url: https://github.com/cert-manager/makefile-modules.git
3232
repo_ref: main
33-
repo_hash: 279334d152866c753421232cf237dab891fbaf5f
33+
repo_hash: 43af254fa25ae30453a9ffe63cd37feab130917c
3434
repo_path: modules/repository-base
3535
- folder_name: tools
3636
repo_url: https://github.com/cert-manager/makefile-modules.git
3737
repo_ref: main
38-
repo_hash: 279334d152866c753421232cf237dab891fbaf5f
38+
repo_hash: 43af254fa25ae30453a9ffe63cd37feab130917c
3939
repo_path: modules/tools

make/_shared/repository-base/base-dependabot/.github/dependabot.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# THIS FILE IS AUTOMATICALLY GENERATED. DO NOT EDIT.
2-
# Edit https://github.com/cert-manager/makefile-modules/blob/main/modules/repository-base/base/.github/dependabot.yaml instead.
2+
# Edit https://github.com/cert-manager/makefile-modules/blob/main/modules/repository-base/base-dependabot/.github/dependabot.yaml instead.
33

44
# Update Go dependencies and GitHub Actions dependencies daily.
55
version: 2

make/_shared/repository-base/base/.github/workflows/make-self-upgrade.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ jobs:
3232
echo "This workflow should not be run on a non-branch-head."
3333
exit 1
3434
35-
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
35+
- uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
3636

3737
- id: go-version
3838
run: |

make/_shared/tools/00_mod.mk

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -183,7 +183,11 @@ CURL := curl --silent --show-error --fail --location --retry 10 --retry-connrefu
183183
# can run the "link $(DOWNLOAD_DIR)/tools/xxx@$(XXX_VERSION)_$(HOST_OS)_$(HOST_ARCH)
184184
# to $(bin_dir)/tools/xxx" operation simultaneously without issues (both
185185
# will perform the action and the second time the link will be overwritten).
186-
LN := ln -fs
186+
#
187+
# -s = Create a symbolic link
188+
# -f = Force the creation of the link (replace existing links)
189+
# -n = If destination already exists, replace it, don't use it as a directory to create a new link inside
190+
LN := ln -fsn
187191

188192
upper_map := a:A b:B c:C d:D e:E f:F g:G h:H i:I j:J k:K l:L m:M n:N o:O p:P q:Q r:R s:S t:T u:U v:V w:W x:X y:Y z:Z
189193
uc = $(strip \

0 commit comments

Comments
 (0)