diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 034d4f5..b935ec9 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -19,11 +19,14 @@ jobs: java-version: '21' cache: maven - - name: Set dated development version + - name: Set build version id: dev shell: bash run: | - dev_version="DEV-$(date -u +%Y%m%d-%H%M)" + dev_version="main-SNAPSHOT" + if [[ "$GITHUB_EVENT_NAME" == "pull_request" ]]; then + dev_version="DEV-$(date -u +%Y%m%d-%H%M)" + fi mvn -B --no-transfer-progress -P'!deploy-live' org.codehaus.mojo:versions-maven-plugin:2.22.0:set \ -DnewVersion="$dev_version" -DgenerateBackupPoms=false mvn -B --no-transfer-progress -P'!deploy-live' help:evaluate \ @@ -45,6 +48,7 @@ jobs: - name: Upload plugin jar + if: github.event_name == 'pull_request' uses: actions/upload-artifact@v7 with: name: ${{ steps.dev.outputs.name }}-${{ github.run_id }}-${{ github.run_attempt }} diff --git a/.github/workflows/maven-release.yml b/.github/workflows/maven-release.yml index 1659a9b..91913f5 100644 --- a/.github/workflows/maven-release.yml +++ b/.github/workflows/maven-release.yml @@ -54,18 +54,13 @@ jobs: bash .github/scripts/prepare-release.sh fi - - name: Check Maven version and build + - name: Set version from tag and build id: maven env: TAG: ${{ github.ref_name }} run: | - version_file="$RUNNER_TEMP/maven-release-version" - mvn -B --no-transfer-progress -P'!deploy-live' help:evaluate \ - -Dexpression=project.version -Doutput="$version_file" - [[ "$(cat "$version_file")" == "${TAG#v}" ]] || { - echo '::error::The tag must match project.version exactly.' - exit 1 - } + mvn -B --no-transfer-progress -P'!deploy-live' org.codehaus.mojo:versions-maven-plugin:2.22.0:set \ + -DnewVersion="${TAG#v}" -DgenerateBackupPoms=false mvn -B --no-transfer-progress -P'!deploy-live' help:evaluate \ -Dexpression=project.build.finalName -Doutput="$RUNNER_TEMP/final-name" final_name=$(cat "$RUNNER_TEMP/final-name") diff --git a/pom.xml b/pom.xml index 6b2c0bf..82b005f 100755 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ net.coreprotect CoreProtect - 25.0.0 + main-SNAPSHOT 21