[tomcat-native] branch main updated: Fix script so it works with current git layout

[ma...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

markt pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tomcat-native.git


The following commit(s) were added to refs/heads/main by this push:
     new 2133b43  Fix script so it works with current git layout
2133b43 is described below

commit 2133b4383672df280e6b7a868607d004142a3422
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Wed Mar 16 19:32:10 2022 +0000

    Fix script so it works with current git layout
---
 jnirelease.sh                     | 8 ++++----
 xdocs/miscellaneous/changelog.xml | 3 +++
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/jnirelease.sh b/jnirelease.sh
index 6763b28..2246585 100755
--- a/jnirelease.sh
+++ b/jnirelease.sh
@@ -162,11 +162,11 @@ else
     git checkout ${JKJNIHASH}
 fi
 
-if [ ! -d .git/refs/remotes/10.0.x ]; then
-    git remote add -f 10.0.x ${TCJAVA_GITBASE}
+if [ ! -d .git/refs/remotes/tcjava ]; then
+    git remote add -f tcjava ${TCJAVA_GITBASE}
 fi
-git remote update 10.0.x
-diffcount=`git diff HEAD remotes/10.0.x/main java/org/apache/tomcat/jni | wc -l`
+git remote update tcjava
+diffcount=`git diff HEAD remotes/tcjava/10.0.x java/org/apache/tomcat/jni | wc -l`
 
 if [ $diffcount -ne 0 ]; then
     echo "WARNING: git subtree is not up to date with"
diff --git a/xdocs/miscellaneous/changelog.xml b/xdocs/miscellaneous/changelog.xml
index d749412..f886dee 100644
--- a/xdocs/miscellaneous/changelog.xml
+++ b/xdocs/miscellaneous/changelog.xml
@@ -39,6 +39,9 @@
     <update>
       Update recommended OpenSSL version to 1.1.1n or later. (markt)
     </update>
+    <fix>
+      Fix release script so it works with the current git layout. (markt)
+    </fix>
   </changelog>
 </section>
 <section name="Changes in 1.2.31">

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org