[release] auto-merge released main back to dev

.github/workflows/build-release-on-main-push.yml

@@ -21,51 +21,51 @@ jobs:
     runs-on: ${{ matrix.os }}
 
     steps:
-      - name: checkout
+      - id: checkout
         uses: actions/checkout@v4
         with:
-          ref: main
+          fetch-depth: 0
+          fetch-tags: true
 
-      - 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/[email protected]
         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/[email protected]
         with:
           repo-token: ${{ secrets.GITHUB_TOKEN }}
-          tag: ${{ steps.version-extractor.outputs.version }}
+          tag: ${{ steps.get-version-from-pom.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 }}
+          tag_name: ${{ steps.get-version-from-pom.outputs.version }}
           files: target/dist/*
 
-      - name: merge-main-to-dev
+      - 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"

pom.xml

@@ -4,7 +4,7 @@
 
     <groupId>net.osslabz</groupId>
     <artifactId>log-gazer</artifactId>
-    <version>1.1.4</version>
+    <version>1.1.5</version>
 
     <properties>
         <osslabz.encoding>UTF-8</osslabz.encoding>