From 0a524472428786041494fb76d1b5e2b8d2f72ff3 Mon Sep 17 00:00:00 2001
From: Ryan Barlow <7389646+ryanbarlow97@users.noreply.github.com>
Date: Tue, 22 Sep 2026 23:27:15 +0000
Subject: [PATCH] fix(ci): derive plugin release versions from tags

---
 .github/workflows/build.yml         |  8 ++++++--
 .github/workflows/maven-release.yml | 11 +++--------
 pom.xml                             |  2 +-
 3 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 613076e..1f3f648 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 c50bc46..1c1b253 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
 
     <groupId>tfmc.justin</groupId>
     <artifactId>musicalinstruments</artifactId>
-    <version>3.0.0</version>
+    <version>main-SNAPSHOT</version>
 
     <name>MusicalInstruments</name>
     <url>tfminecraft.net</url>