This is an automated email from the ASF dual-hosted git repository.
cdutz pushed a commit to branch rel/0.13
in repository https://gitbox.apache.org/repos/asf/plc4x.git
The following commit(s) were added to refs/heads/rel/0.13 by this push:
new 73ea49b92b chore: Moved the setting of the tracking upstream branch to
step 1
73ea49b92b is described below
commit 73ea49b92b851c8034ecee522ccd4c00b2a91bbd
Author: Christofer Dutz <[email protected]>
AuthorDate: Fri Aug 1 08:49:35 2025 +0200
chore: Moved the setting of the tracking upstream branch to step 1
---
tools/release-1-create-branch.sh | 6 ++++++
tools/release-2-prepare-release.sh | 4 +---
2 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/tools/release-1-create-branch.sh b/tools/release-1-create-branch.sh
index 24bfd8bdf7..3dfeee8812 100755
--- a/tools/release-1-create-branch.sh
+++ b/tools/release-1-create-branch.sh
@@ -154,4 +154,10 @@ if ! git -C "$DIRECTORY" checkout "$BRANCH_NAME"; then
exit 1
fi
+# Make sure the release branch is also pushed to the remote.
+if ! git -C "$DIRECTORY" push --set-upstream origin "$BRANCH_NAME"; then
+ echo "❌ Got non-0 exit code from pushing changes, aborting."
+ exit 1
+fi
+
echo "✅ Release branch creation complete. We have switched the local branch to
the release branch. Please continue with 'release-2-prepare-release.sh' as soon
as the release branch is ready for being released."
\ No newline at end of file
diff --git a/tools/release-2-prepare-release.sh
b/tools/release-2-prepare-release.sh
index 9316d8e4ed..06f0158595 100755
--- a/tools/release-2-prepare-release.sh
+++ b/tools/release-2-prepare-release.sh
@@ -33,8 +33,6 @@ fi
PROJECT_VERSION=$("$DIRECTORY"/mvnw -f "$DIRECTORY"/pom.xml -q
-Dexec.executable=echo -Dexec.args="\${project.version}" --non-recursive
exec:exec)
RELEASE_VERSION=${PROJECT_VERSION%"-SNAPSHOT"}
-RELEASE_SHORT_VERSION=${RELEASE_VERSION%".0"}
-BRANCH_NAME="rel/$RELEASE_SHORT_VERSION"
IFS='.' read -ra VERSION_SEGMENTS <<< "$RELEASE_VERSION"
NEW_VERSION="${VERSION_SEGMENTS[0]}.${VERSION_SEGMENTS[1]}.$((VERSION_SEGMENTS[2]
+ 1))-SNAPSHOT"
@@ -52,7 +50,7 @@ fi
# 2. Push the changes (local)
########################################################################################################################
-if ! git -C "$DIRECTORY" push --set-upstream origin "$BRANCH_NAME"; then
+if ! git -C "$DIRECTORY" push; then
echo "❌ Got non-0 exit code from pushing changes to git, aborting."
exit 1
fi
