From 69b301eba3e74ea6e71d7eb108020e7b2438f105 Mon Sep 17 00:00:00 2001
From: Tamas Cservenak <tamas@cservenak.net>
Date: Fri, 14 Jun 2024 12:45:30 +0200
Subject: [PATCH] More script changes (#1020)

Changes:
* `release-build.sh`: Just do not push. This allows one to locally verify the outcome, and push (for now manually like `git push origin mvnd-1.x --tags`). Added reminder message.
* `release.yaml`: whenever mvn would resolve deps, make sure release settings XML is present. It does not stir anything if Maven is in Central, but as in this moment, maven is still staged only.
---
 .github/workflows/release.yaml |  2 +-
 build/release-build.sh         | 12 +++++++++---
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
index 0e64bbf49..9af7cc451 100644
--- a/.github/workflows/release.yaml
+++ b/.github/workflows/release.yaml
@@ -154,7 +154,7 @@ jobs:
           github-token: ${{ secrets.GITHUB_TOKEN }}
 
       - name: 'Build source distribution'
-        run: ./mvnw clean verify -Psource-distribution -N -B -ntp -e
+        run: ./mvnw clean verify -Psource-distribution -N -B -ntp -e -s .mvn/release-settings.xml
 
       - name: 'Upload artifact'
         uses: actions/upload-artifact@v4
diff --git a/build/release-build.sh b/build/release-build.sh
index ec1dc49f7..5e21b8fff 100755
--- a/build/release-build.sh
+++ b/build/release-build.sh
@@ -113,7 +113,7 @@ startup_check
 # update version
 mvn versions:set -DnewVersion=$VERSION
 
-# udpate changelog
+# update changelog
 docker run -it --rm -v "$(pwd)":/usr/local/src/your-app githubchangeloggenerator/github-changelog-generator \
     --user apache --project maven-mvnd --token $GITHUB_TOKEN --future-release $VERSION \
     --exclude-tags early-access,0.9.0,1.0.0-m2,build-1.0.0-m2,1.0.0-m3
@@ -129,7 +129,7 @@ git commit -m "[release] Release $VERSION"
 
 # Create and push tag
 git tag $VERSION
-git push origin $VERSION
+# git push origin $VERSION
 # Pushing a tag will trigger the CI to build the release and publish
 # the artifacts on https://github.com/apache/maven-mvnd/releases
 
@@ -139,4 +139,10 @@ mvn versions:set -DnewVersion=$NEXT_VERSION
 # commit
 git add -A
 git commit -m "Next is $NEXT_VERSION"
-git push origin mvnd-1.x
+# git push origin mvnd-1.x
+
+# NOTE: Manually push once done: git push origin mvnd-1.x --tags
+echo "=============================================================================="
+echo "Release done, nothing got pushed (yet); please push changes with command below"
+echo "$ git push origin mvnd-1.x --tags"
+echo ""
\ No newline at end of file