From 3f2bbcffc7e2a984eda42267be32169a6e188aba Mon Sep 17 00:00:00 2001 From: Raphael Vullriede Date: Tue, 3 Dec 2024 08:40:58 +0100 Subject: [PATCH 1/6] fix: prep next release --- .../workflows/build-release-on-main-push.yml | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/.github/workflows/build-release-on-main-push.yml b/.github/workflows/build-release-on-main-push.yml index c754d79..6647130 100644 --- a/.github/workflows/build-release-on-main-push.yml +++ b/.github/workflows/build-release-on-main-push.yml @@ -21,49 +21,49 @@ jobs: runs-on: ${{ matrix.os }} steps: - - name: checkout + - id: checkout uses: actions/checkout@v4 with: ref: main - - name: setup-jdk + - id: setup-jdk uses: actions/setup-java@v4 with: java-version: 21 distribution: 'temurin' cache: 'maven' - - name: maven-build-verify + - id: maven-build-verify run: mvn --batch-mode -Posslabz-release -Pnative-jpackage clean verify - - name: configure-git-user + - id: configure-git-user uses: qoomon/actions--setup-git@v1 with: user: bot - - name: Extract version from pom.xml file - id: version-extractor + - id: get-version-from-pom uses: dostonhamrakulov/maven-artifact-version-extractor@v1.0 with: file_path: ${{ github.workspace }}/pom.xml - - name: Get the output version - run: echo "The found version ${{ steps.version-extractor.outputs.version }}" + - id: get-latest-tag + uses: WyriHaximus/github-action-get-previous-tag@v1 - - name: Tag snapshot + - name: tag-version + if: ${{ steps.get-version-from-pom.outputs.version != steps.get-latest-tag.outputs.tag}} uses: tvdias/github-tagger@v0.0.1 with: repo-token: ${{ secrets.GITHUB_TOKEN }} tag: ${{ steps.version-extractor.outputs.version }} - - name: create-release-notes + - id: create-release-notes uses: softprops/action-gh-release@v2 with: generate_release_notes: true tag_name: ${{ steps.version-extractor.outputs.version }} files: target/dist/* - - name: merge-main-to-dev + - id: merge-main-to-dev run: | git fetch --unshallow git checkout dev From 0cf08ae0d00b4254d0e9de6d848038fd34a4ecd6 Mon Sep 17 00:00:00 2001 From: Raphael Vullriede Date: Tue, 3 Dec 2024 08:45:58 +0100 Subject: [PATCH 2/6] fix: prep next release --- .github/workflows/build-release-on-main-push.yml | 2 +- pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build-release-on-main-push.yml b/.github/workflows/build-release-on-main-push.yml index 6647130..1b92498 100644 --- a/.github/workflows/build-release-on-main-push.yml +++ b/.github/workflows/build-release-on-main-push.yml @@ -54,7 +54,7 @@ jobs: uses: tvdias/github-tagger@v0.0.1 with: repo-token: ${{ secrets.GITHUB_TOKEN }} - tag: ${{ steps.version-extractor.outputs.version }} + tag: ${{ steps.get-version-from-pom.outputs.version }} - id: create-release-notes uses: softprops/action-gh-release@v2 diff --git a/pom.xml b/pom.xml index 52d14f4..b8e4be3 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ net.osslabz log-gazer - 1.1.4 + 1.1.5 UTF-8 From 533a97041479e8a02f1d3499e7d2e22c2eaa7f7e Mon Sep 17 00:00:00 2001 From: Raphael Vullriede Date: Tue, 3 Dec 2024 10:02:40 +0100 Subject: [PATCH 3/6] fix: prep for next release --- .github/workflows/build-release-on-main-push.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build-release-on-main-push.yml b/.github/workflows/build-release-on-main-push.yml index 1b92498..c01f17d 100644 --- a/.github/workflows/build-release-on-main-push.yml +++ b/.github/workflows/build-release-on-main-push.yml @@ -48,6 +48,8 @@ jobs: - id: get-latest-tag uses: WyriHaximus/github-action-get-previous-tag@v1 + with: + workingDirectory: ${{ github.workspace }} - name: tag-version if: ${{ steps.get-version-from-pom.outputs.version != steps.get-latest-tag.outputs.tag}} @@ -60,7 +62,7 @@ jobs: uses: softprops/action-gh-release@v2 with: generate_release_notes: true - tag_name: ${{ steps.version-extractor.outputs.version }} + tag_name: ${{ steps.get-version-from-pom.outputs.version }} files: target/dist/* - id: merge-main-to-dev From f9aa743a07fa477e92a85e2c953cf5e646f42f44 Mon Sep 17 00:00:00 2001 From: Raphael Vullriede Date: Tue, 3 Dec 2024 10:13:15 +0100 Subject: [PATCH 4/6] fix: prep for next release --- .github/workflows/build-release-on-main-push.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.github/workflows/build-release-on-main-push.yml b/.github/workflows/build-release-on-main-push.yml index c01f17d..ac53f7a 100644 --- a/.github/workflows/build-release-on-main-push.yml +++ b/.github/workflows/build-release-on-main-push.yml @@ -24,7 +24,7 @@ jobs: - id: checkout uses: actions/checkout@v4 with: - ref: main + fetch-tags: true - id: setup-jdk uses: actions/setup-java@v4 @@ -48,8 +48,6 @@ jobs: - id: get-latest-tag uses: WyriHaximus/github-action-get-previous-tag@v1 - with: - workingDirectory: ${{ github.workspace }} - name: tag-version if: ${{ steps.get-version-from-pom.outputs.version != steps.get-latest-tag.outputs.tag}} From 35a8a7ee6226a8ddd7fbeff1f6ba8bd10e6b5118 Mon Sep 17 00:00:00 2001 From: Raphael Vullriede Date: Tue, 3 Dec 2024 10:18:07 +0100 Subject: [PATCH 5/6] fix: prep for next release --- .github/workflows/build-release-on-main-push.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/build-release-on-main-push.yml b/.github/workflows/build-release-on-main-push.yml index ac53f7a..0c81554 100644 --- a/.github/workflows/build-release-on-main-push.yml +++ b/.github/workflows/build-release-on-main-push.yml @@ -24,6 +24,7 @@ jobs: - id: checkout uses: actions/checkout@v4 with: + fetch-depth: 0 fetch-tags: true - id: setup-jdk From bc9b199ca5e98da2357c9e09a404a6263c43b13b Mon Sep 17 00:00:00 2001 From: Raphael Vullriede Date: Tue, 3 Dec 2024 10:31:19 +0100 Subject: [PATCH 6/6] fix: prep for next release --- .github/workflows/build-release-on-main-push.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/build-release-on-main-push.yml b/.github/workflows/build-release-on-main-push.yml index 0c81554..b53f036 100644 --- a/.github/workflows/build-release-on-main-push.yml +++ b/.github/workflows/build-release-on-main-push.yml @@ -66,7 +66,6 @@ jobs: - id: merge-main-to-dev run: | - git fetch --unshallow git checkout dev git pull git merge --no-ff main -m "[release] auto-merge released main back to dev"