From f8821070003f617e9f2b8ad12783f7ac35031a3a Mon Sep 17 00:00:00 2001
From: Martijn Verburg <martijnverburg@gmail.com>
Date: Fri, 27 Feb 2026 14:58:09 +1300
Subject: [PATCH] Move gradle.properties update from tag-release to
 manual-release workflow

Remove the gradle.properties version update steps from gradle-release.yml
(tag-push workflow) and add them to gradle-release-manual.yml where they
belong. The manual workflow now updates gradle.properties from the entered
tag name before validation and before the build.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
---
 .github/workflows/gradle-release-manual.yml | 20 ++++++++++++++++++++
 .github/workflows/gradle-release.yml        | 21 ---------------------
 2 files changed, 20 insertions(+), 21 deletions(-)

diff --git a/.github/workflows/gradle-release-manual.yml b/.github/workflows/gradle-release-manual.yml
index 7669d5b5826..d5e1df5923f 100644
--- a/.github/workflows/gradle-release-manual.yml
+++ b/.github/workflows/gradle-release-manual.yml
@@ -48,6 +48,16 @@ jobs:
           git push origin "${TAG_NAME}"
           echo "✅ Tag '${TAG_NAME}' created and pushed from $(git rev-parse --short HEAD) on branch ${GITHUB_REF_NAME}."
 
+      - name: Update gradle.properties with release version
+        env:
+          TAG_NAME: ${{ inputs.tag_name }}
+        run: |
+          VERSION="${TAG_NAME#v}"
+          echo "Updating gradle.properties version to ${VERSION}"
+          sed -i "s/^version=.*/version=${VERSION}/" gradle.properties
+          echo "Updated gradle.properties:"
+          grep '^version=' gradle.properties
+
       - name: Validate tag matches gradle.properties version
         env:
           TAG_NAME: ${{ inputs.tag_name }}
@@ -124,6 +134,16 @@ jobs:
       - name: Checkout tag
         run: git checkout "refs/tags/${{ inputs.tag_name }}"
 
+      - name: Update gradle.properties with release version
+        run: |
+          TAG_NAME="${{ inputs.tag_name }}"
+          VERSION="${TAG_NAME#v}"
+          echo "Updating gradle.properties version to ${VERSION}"
+          sed -i.bak "s/^version=.*/version=${VERSION}/" gradle.properties
+          rm -f gradle.properties.bak
+          echo "Updated gradle.properties:"
+          grep '^version=' gradle.properties
+
       - name: Set up JDK 25
         uses: actions/setup-java@v4
         with:
diff --git a/.github/workflows/gradle-release.yml b/.github/workflows/gradle-release.yml
index 1770087294e..dd9c6081f9b 100644
--- a/.github/workflows/gradle-release.yml
+++ b/.github/workflows/gradle-release.yml
@@ -28,16 +28,6 @@ jobs:
         with:
           ref: ${{ inputs.tag_name || github.ref }}
 
-      - name: Update gradle.properties with release version
-        if: github.event_name == 'workflow_dispatch'
-        run: |
-          TAG_NAME="${{ inputs.tag_name }}"
-          VERSION="${TAG_NAME#v}"
-          echo "Updating gradle.properties version to ${VERSION}"
-          sed -i "s/^version=.*/version=${VERSION}/" gradle.properties
-          echo "Updated gradle.properties:"
-          grep '^version=' gradle.properties
-
       - name: Validate tag matches gradle.properties version
         run: |
           TAG_NAME="${{ inputs.tag_name || github.ref_name }}"
@@ -110,17 +100,6 @@ jobs:
         with:
           ref: ${{ inputs.tag_name || github.ref }}
 
-      - name: Update gradle.properties with release version
-        if: github.event_name == 'workflow_dispatch'
-        run: |
-          TAG_NAME="${{ inputs.tag_name }}"
-          VERSION="${TAG_NAME#v}"
-          echo "Updating gradle.properties version to ${VERSION}"
-          sed -i.bak "s/^version=.*/version=${VERSION}/" gradle.properties
-          rm -f gradle.properties.bak
-          echo "Updated gradle.properties:"
-          grep '^version=' gradle.properties
-
       - name: Update PCGenProp.properties with release version and date
         run: |
           PROPS_FILE="code/src/resources/pcgen/system/prop/PCGenProp.properties"