From 42969a5597cf1a9b079e5a8cb06e160d7feef2bf Mon Sep 17 00:00:00 2001 From: Richard Attermeyer Date: Thu, 9 Nov 2023 08:04:42 +0100 Subject: [PATCH] feat!: auto version update chore: auto update version [skip ci] WIP: should fail pipeline WIP: should fail pipeline --- .woodpecker/.lint_general.yml | 2 +- version.sh | 15 ++++++++------- version.txt | 2 +- 3 files changed, 10 insertions(+), 9 deletions(-) diff --git a/.woodpecker/.lint_general.yml b/.woodpecker/.lint_general.yml index 3f5157a..d27e880 100644 --- a/.woodpecker/.lint_general.yml +++ b/.woodpecker/.lint_general.yml @@ -23,7 +23,7 @@ steps: image: node:lts-slim commands: - npm install --save-dev conventional-changelog-conventionalcommits @commitlint/config-conventional commitlint@latest - - echo "$CI_COMMIT_MESSAGE" | npx commitlint + - npx commitlint --from HEAD~1 --to HEAD --verbose when: - branch: [main, dev] event: push diff --git a/version.sh b/version.sh index 98c02c9..81a57de 100755 --- a/version.sh +++ b/version.sh @@ -6,24 +6,25 @@ TRUNK_BRANCH="dev" CD_BASE_VERSION=$(cat version.txt) CD_PATCH=$(git rev-list --count HEAD ^"${TRUNK_BRANCH}") CD_QUALIFIER=$(git rev-parse --short HEAD) -CD_CURRENT_RELEASE_TAG=$(git tag -l --contains HEAD) -CD_NEXT_VERSION="${CD_BASE_VERSION}.${CD_PATCH}" -CD_NEXT_QUALIFIED_VERSION="${CD_BASE_VERSION}.${CD_PATCH}-${CD_QUALIFIER}" +CD_LAST_RELEASE_TAG=$(git tag -l --contains HEAD) +CD_CURRENT_VERSION="${CD_BASE_VERSION}.${CD_PATCH}" +CD_CURRENT_VERSION_QUALIFIED="${CD_BASE_VERSION}.${CD_PATCH}-${CD_QUALIFIER}" CD_NEXT_MAJOR_TAG=$(cut -d'.' -f1 <<< "${CD_BASE_VERSION}") export CD_BASE_VERSION export CD_PATCH export CD_QUALIFIER -export CD_RELEASE_TAG -export CD_NEXT_QUALIFIED_VERSION +export CD_LAST_RELEASE_TAG +export CD_CURRENT_VERSION +export CD_CURRENT_VERSION_QUALIFIED export CD_NEXT_MAJOR_TAG echo "Example versioning" echo "Trunk Branch: ${TRUNK_BRANCH}" echo "Java Development Version: ${CD_BASE_VERSION}.0-SNAPSHOT" echo "NPM Development Version: ${CD_BASE_VERSION}.alpha.0" -echo "Next Release Version: ${CD_NEXT_VERSION}" -echo "Next qualified Release Version: ${CD_NEXT_QUALIFIED_VERSION}" +echo "Next Release Version: ${CD_CURRENT_VERSION}" +echo "Next qualified Release Version: ${CD_CURRENT_VERSION_QUALIFIED}" echo "BASE TAG: ${CD_BASE_VERSION}" echo "Next Major Release Tag: ${CD_NEXT_MAJOR_TAG}" echo "Current Release Tag (normally get from pipeline CI_COMMIT_TAG): ${CD_RELEASE_TAG}" diff --git a/version.txt b/version.txt index 5a2a580..d3827e7 100644 --- a/version.txt +++ b/version.txt @@ -1 +1 @@ -0.6 +1.0