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:04 UTC
(tomcat) branch 10.1.x updated (2b3f0f0964 -> 8133da5e46)
This is an automated email from the ASF dual-hosted git repository.
schultz pushed a change to branch 10.1.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
from 2b3f0f0964 Improvements to French translations. (remm)
new 492aaf7439 Fix issues with verify-release.
new 8133da5e46 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 10.1.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 8133da5e46a0b5f971b0617fbca256649f7b4c6e
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 4b3b28de80..dee2537aae 100644
--- a/build.xml
+++ b/build.xml
@@ -2510,6 +2510,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" />
@@ -2529,6 +2530,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>
@@ -4161,8 +4165,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>
@@ -4237,10 +4240,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 10.1.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 492aaf74397cc1fe7f67321f7ddb1ef57460daaa
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 a23a81d3e3..4b3b28de80 100644
--- a/build.xml
+++ b/build.xml
@@ -4155,14 +4155,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" />
@@ -4291,7 +4293,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