This is an automated email from the ASF dual-hosted git repository.
schultz pushed a commit to branch 9.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 07020996f2de0e589cdddd837c8ef66d61430806
Author: schultz <schu...@apache.org>
AuthorDate: Fri Dec 8 13:17:04 2023 -0800
Fix issues with verify-release.
Fix hash-compare to use the correct file path.
Fix ant version-check.
---
build.xml | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/build.xml b/build.xml
index 7a910b2f98..c946db3ea1 100644
--- a/build.xml
+++ b/build.xml
@@ -4092,14 +4092,16 @@ Unable to locate release hash for @{basefile}
<sequential>
<!--
- <echo>Comparing hash files
output/release/v${version.major}.${version.minor}.${version.build}/@{src-or-bin}/@{basefile}.sha512
verify/@{basefile}.sha512</echo>
+ <echo>Comparing hash files
output/release/v${version}/@{src-or-bin}/@{basefile}.sha512
verify/@{basefile}.sha512</echo>
-->
<condition property="reproducible-@{num}">
- <filesmatch
file1="output/release/v${version.major}.${version.minor}.${version.build}/@{src-or-bin}/@{basefile}.sha512"
+ <filesmatch
file1="output/release/v${version}/@{src-or-bin}/@{basefile}.sha512"
file2="verify/@{basefile}.sha512"/>
</condition>
+ <echo if:set="reproducible-@{num}">Signature MATCH for
@{src-or-bin}/@{basefile}
+ </echo>
<echo unless:set="reproducible-@{num}">
-Signature mismatch for @{basefile}:
+Signature mismatch for @{src-or-bin}/@{basefile}:
</echo>
<printfile unless:set="reproducible-@{num}"
file="output/release/v${version}/@{src-or-bin}/@{basefile}.sha512" />
<printfile unless:set="reproducible-@{num}"
file="verify/@{basefile}.sha512" />
@@ -4228,7 +4230,7 @@ All (important) signatures are verified; the build
appears to be reproducible.
<antversion property="antversion"/>
<condition property="release-toolchain-versions-match">
<and>
- <antversion exactly="${antversion}" />
+ <antversion exactly="${release-ant-version}" />
<equals arg1="${java.vm.version}" arg2="${release-java-version}" />
</and>
</condition>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
