Skip to content

Commit

Permalink
upgrade repository-base module
Browse files Browse the repository at this point in the history
Signed-off-by: Tim Ramlot <[email protected]>
  • Loading branch information
inteon committed Jan 15, 2024
1 parent 5cd4e71 commit 20d9634
Show file tree
Hide file tree
Showing 5 changed files with 5 additions and 3 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 @@ -56,7 +56,7 @@ jobs:
run: |
git config --global user.name "jetstack-bot"
git config --global user.email "[email protected]"
git commit -a -m "BOT: run 'make upgrade-klone' and 'make generate'" --signoff
git add -A && git commit -m "BOT: run 'make upgrade-klone' and 'make generate'" --signoff
git push -f origin self-upgrade
- if: ${{ steps.is-up-to-date.outputs.result != 'true' }}
Expand Down
1 change: 1 addition & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,7 @@ endif
##################################

VERSION ?= $(shell git describe --tags --always --match='v*' --abbrev=14 --dirty)
IS_PRERELEASE := $(shell git describe --tags --always --match='v*' --abbrev=0 | grep -q '-' && echo true || echo false)
GITCOMMIT := $(shell git rev-parse HEAD)
GITEPOCH := $(shell git show -s --format=%ct HEAD)

Expand Down
2 changes: 1 addition & 1 deletion klone.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ targets:
- folder_name: repository-base
repo_url: https://github.com/cert-manager/makefile-modules.git
repo_ref: main
repo_hash: 9f0a38db1bbd0ac468c2b12d6f61251b2f4452d9
repo_hash: dc8ce162c76ca7b95f80157aefa4afb9d2783b82
repo_path: modules/repository-base
- folder_name: tools
repo_url: https://github.com/cert-manager/makefile-modules.git
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ jobs:
run: |
git config --global user.name "jetstack-bot"
git config --global user.email "[email protected]"
git commit -a -m "BOT: run 'make upgrade-klone' and 'make generate'" --signoff
git add -A && git commit -m "BOT: run 'make upgrade-klone' and 'make generate'" --signoff
git push -f origin self-upgrade
- if: ${{ steps.is-up-to-date.outputs.result != 'true' }}
Expand Down
1 change: 1 addition & 0 deletions make/_shared/repository-base/base/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,7 @@ endif
##################################

VERSION ?= $(shell git describe --tags --always --match='v*' --abbrev=14 --dirty)
IS_PRERELEASE := $(shell git describe --tags --always --match='v*' --abbrev=0 | grep -q '-' && echo true || echo false)
GITCOMMIT := $(shell git rev-parse HEAD)
GITEPOCH := $(shell git show -s --format=%ct HEAD)

Expand Down

0 comments on commit 20d9634

Please sign in to comment.