diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 44b7ab6..3016d2c 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -25,11 +25,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 \
@@ -51,6 +54,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 4360e28..00508d6 100644
--- a/.github/workflows/maven-release.yml
+++ b/.github/workflows/maven-release.yml
@@ -43,18 +43,13 @@ jobs:
}
[[ "${TAG^^}" != *SNAPSHOT* ]] || exit 1
- - 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 6c38e40..b660d6a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
com.nowko
archeology-plugin
- 2.0.0
+ main-SNAPSHOT
archeology-plugin