From 20d96346cb386a7183a2922a83d3fb8026302236 Mon Sep 17 00:00:00 2001
From: Tim Ramlot <42113979+inteon@users.noreply.github.com>
Date: Mon, 15 Jan 2024 19:57:17 +0100
Subject: [PATCH] upgrade repository-base module

Signed-off-by: Tim Ramlot <42113979+inteon@users.noreply.github.com>
---
 .github/workflows/make-self-upgrade.yaml                        | 2 +-
 Makefile                                                        | 1 +
 klone.yaml                                                      | 2 +-
 .../base/.github/workflows/make-self-upgrade.yaml               | 2 +-
 make/_shared/repository-base/base/Makefile                      | 1 +
 5 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/make-self-upgrade.yaml b/.github/workflows/make-self-upgrade.yaml
index 0bf2265d..ccebdb24 100644
--- a/.github/workflows/make-self-upgrade.yaml
+++ b/.github/workflows/make-self-upgrade.yaml
@@ -56,7 +56,7 @@ jobs:
         run: |
           git config --global user.name "jetstack-bot"
           git config --global user.email "jetstack-bot@users.noreply.github.com"
-          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' }}
diff --git a/Makefile b/Makefile
index aa9c48b5..11671240 100644
--- a/Makefile
+++ b/Makefile
@@ -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)
 
diff --git a/klone.yaml b/klone.yaml
index 9e951f4b..a2c2525e 100644
--- a/klone.yaml
+++ b/klone.yaml
@@ -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
diff --git a/make/_shared/repository-base/base/.github/workflows/make-self-upgrade.yaml b/make/_shared/repository-base/base/.github/workflows/make-self-upgrade.yaml
index 0bf2265d..ccebdb24 100644
--- a/make/_shared/repository-base/base/.github/workflows/make-self-upgrade.yaml
+++ b/make/_shared/repository-base/base/.github/workflows/make-self-upgrade.yaml
@@ -56,7 +56,7 @@ jobs:
         run: |
           git config --global user.name "jetstack-bot"
           git config --global user.email "jetstack-bot@users.noreply.github.com"
-          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' }}
diff --git a/make/_shared/repository-base/base/Makefile b/make/_shared/repository-base/base/Makefile
index aa9c48b5..11671240 100644
--- a/make/_shared/repository-base/base/Makefile
+++ b/make/_shared/repository-base/base/Makefile
@@ -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)