diff --git a/.github/workflows/build-release-on-main-push.yml b/.github/workflows/build-release-on-main-push.yml index c754d79..b53f036 100644 --- a/.github/workflows/build-release-on-main-push.yml +++ b/.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/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 }} + 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" 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