diff --git a/.github/workflows/build-release-on-main-push.yml b/.github/workflows/build-release-on-main-push.yml index 4a347d2..c754d79 100644 --- a/.github/workflows/build-release-on-main-push.yml +++ b/.github/workflows/build-release-on-main-push.yml @@ -14,6 +14,7 @@ jobs: packages: write strategy: + max-parallel: 1 # otherwise the release upload will fail matrix: os: [ ubuntu-latest, windows-latest, macos-13, macos-14 ] @@ -33,22 +34,33 @@ jobs: cache: 'maven' - name: maven-build-verify - run: mvn --batch-mode -Posslabz-release,native-jpackage clean verify + run: mvn --batch-mode -Posslabz-release -Pnative-jpackage clean verify - name: configure-git-user uses: qoomon/actions--setup-git@v1 with: user: bot - - name: get-latest-tag - id: get-latest-tag - uses: WyriHaximus/github-action-get-previous-tag@v1 + - name: Extract version from pom.xml file + id: version-extractor + 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 }}" + + - name: Tag snapshot + uses: tvdias/github-tagger@v0.0.1 + with: + repo-token: ${{ secrets.GITHUB_TOKEN }} + tag: ${{ steps.version-extractor.outputs.version }} - name: create-release-notes uses: softprops/action-gh-release@v2 with: generate_release_notes: true - tag_name: ${{ steps.get-latest-tag.outputs.tag }} + tag_name: ${{ steps.version-extractor.outputs.version }} files: target/dist/* - name: merge-main-to-dev diff --git a/pom.xml b/pom.xml index 608dfa2..52d14f4 100644 --- a/pom.xml +++ b/pom.xml @@ -1,12 +1,10 @@ - + 4.0.0 net.osslabz log-gazer - 1.0.0-SNAPSHOT + 1.1.4 UTF-8 @@ -15,11 +13,11 @@ ${osslabz.encoding} ${osslabz.encoding} - 2024-11-25T13:11:23Z + 2024-12-02T20:20:06Z ${osslabz.java.version} - net.osslabz.loggazer.LogGazerApp - + net.osslabz.loggazer.AppStarter + 1.6.5 @@ -43,7 +41,7 @@ scm:git:https://github.com/osslabz/log-gazer.git scm:git:https://github.com/osslabz/log-gazer.git https://github.com/osslabz/log-gazer - main + 1.1.0 @@ -116,36 +114,6 @@ deploy - - org.apache.maven.plugins - maven-source-plugin - 3.3.1 - - - attach-sources - - jar-no-fork - - - - - - org.apache.maven.plugins - maven-javadoc-plugin - 3.11.1 - - - attach-javadocs - - jar - - - none - false - - - - @@ -291,17 +259,17 @@ - + - + - - + + @@ -347,11 +315,11 @@ - + ${mainClass} + @@ -361,6 +329,7 @@ maven-jar-plugin 3.4.2 + ${mainClass} diff --git a/src/main/java/net/osslabz/loggazer/package-info.java b/src/main/java/net/osslabz/loggazer/package-info.java new file mode 100644 index 0000000..f1d87c1 --- /dev/null +++ b/src/main/java/net/osslabz/loggazer/package-info.java @@ -0,0 +1 @@ +package net.osslabz.loggazer; \ No newline at end of file