You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by sc...@apache.org on 2023/12/09 20:21:47 UTC
(tomcat) branch 8.5.x updated (bf1a093b63 -> 3e6dcadf3d)
This is an automated email from the ASF dual-hosted git repository.
schultz pushed a change to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
from bf1a093b63 Fix NIO2 and virtual threads (NIO2 requires ExecutorService)
new 7b9f2615a8 Fix issues with verify-release.
new 3e6dcadf3d Improve verify-release target.
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
build.xml | 15 +++++++++------
1 file changed, 9 insertions(+), 6 deletions(-)
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
(tomcat) 02/02: Improve verify-release target.
Posted by sc...@apache.org.
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 <sc...@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-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
(tomcat) 01/02: Fix issues with verify-release.
Posted by sc...@apache.org.
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 7b9f2615a8e14163b9c101749f3f0f1f8cfc4959
Author: schultz <sc...@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 3f12a0ba31..7dcd417299 100644
--- a/build.xml
+++ b/build.xml
@@ -3660,14 +3660,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" />
@@ -3796,7 +3798,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-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org