This is an automated email from the ASF dual-hosted git repository.
schultz pushed a commit to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 3e6dcadf3df65edaa7875c665bad1785b00edbf8
Author: schultz <schu...@apache.org>
AuthorDate: Sat Dec 9 12:14:19 2023 -0800
Improve verify-release target.
Include all release artifacts in final release verification check.
Suppress verify/ and any vi swap files from src bundle.
---
build.xml | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/build.xml b/build.xml
index 7dcd417299..1b41c928d9 100644
--- a/build.xml
+++ b/build.xml
@@ -2156,6 +2156,7 @@ Apache Tomcat ${version} native binaries for Win64
AMD64/EMT64 platform.
</and>
<filename name="**/*.asc" />
<filename name="**/*.tmp" />
+ <filename name="**/.*.sw*" />
<filename name="**/maven-resolver-ant-tasks-*.jar" />
<filename name="**/thumbs.db" />
<filename name="**/Thumbs.db" />
@@ -2175,6 +2176,9 @@ Apache Tomcat ${version} native binaries for Win64
AMD64/EMT64 platform.
<filename name="modules/jdbc-pool/**" />
</not>
</and>
+ <!-- Do not inculde any files user for release-verification -->
+ <filename name="verify" />
+ <filename name="verify/**" />
</or>
</not>
</fileset>
@@ -3666,8 +3670,7 @@ Unable to locate release hash for @{basefile}
<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 if:set="reproducible-@{num}">Signature MATCH for
@{src-or-bin}/@{basefile}</echo>
<echo unless:set="reproducible-@{num}">
Signature mismatch for @{src-or-bin}/@{basefile}:
</echo>
@@ -3742,10 +3745,8 @@ reproducible-10=${reproducible-10}
<isset property="reproducible-6" />
<isset property="reproducible-7" />
<isset property="reproducible-8" />
-<!--
<isset property="reproducible-9" />
<isset property="reproducible-10" />
--->
</and>
</condition>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
