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.git


The following commit(s) were added to refs/heads/main by this push:
     new 07375b18cc Remove reproducibility checks for file that isn't in 12.0.x
07375b18cc is described below

commit 07375b18cc331fcf877bc93e17ef0ecbb2e9b1a6
Author: Mark Thomas <[email protected]>
AuthorDate: Thu Nov 6 16:25:21 2025 +0000

    Remove reproducibility checks for file that isn't in 12.0.x
---
 build.xml | 26 --------------------------
 1 file changed, 26 deletions(-)

diff --git a/build.xml b/build.xml
index 4c1f3133ce..c8a04ca47f 100644
--- a/build.xml
+++ b/build.xml
@@ -4458,7 +4458,6 @@ It appears there are no build artifacts to verify. Please 
run 'ant release' firs
     <get-release-hash src-or-bin="bin" basefile="${final.name}-deployer.zip" />
     <get-release-hash src-or-bin="bin" 
basefile="${final.name}-fulldocs.tar.gz" />
     <get-release-hash src-or-bin="bin" 
basefile="${final.name}-windows-x64.zip" />
-    <get-release-hash src-or-bin="bin" 
basefile="${final.name}-windows-x86.zip" />
     <get-release-hash src-or-bin="bin" basefile="${final.name}.exe" />
     <get-release-hash src-or-bin="bin" basefile="${final.name}.tar.gz" />
     <get-release-hash src-or-bin="bin" basefile="${final.name}.zip" />
@@ -4469,7 +4468,6 @@ It appears there are no build artifacts to verify. Please 
run 'ant release' firs
     <get-release-signature src-or-bin="bin" 
basefile="${final.name}-deployer.zip" />
     <get-release-signature src-or-bin="bin" 
basefile="${final.name}-fulldocs.tar.gz" />
     <get-release-signature src-or-bin="bin" 
basefile="${final.name}-windows-x64.zip" />
-    <get-release-signature src-or-bin="bin" 
basefile="${final.name}-windows-x86.zip" />
     <get-release-signature src-or-bin="bin" basefile="${final.name}.exe" />
     <get-release-signature src-or-bin="bin" basefile="${final.name}.tar.gz" />
     <get-release-signature src-or-bin="bin" basefile="${final.name}.zip" />
@@ -4480,7 +4478,6 @@ It appears there are no build artifacts to verify. Please 
run 'ant release' firs
     <compare-hashes num="2"  src-or-bin="bin" 
basefile="${final.name}-deployer.zip" />
     <compare-hashes num="3"  src-or-bin="bin" 
basefile="${final.name}-fulldocs.tar.gz" />
     <compare-hashes num="4"  src-or-bin="bin" 
basefile="${final.name}-windows-x64.zip" />
-    <compare-hashes num="5"  src-or-bin="bin" 
basefile="${final.name}-windows-x86.zip" />
     <compare-hashes num="6"  src-or-bin="bin" basefile="${final.name}.exe" />
     <compare-hashes num="7"  src-or-bin="bin" basefile="${final.name}.tar.gz" 
/>
     <compare-hashes num="8"  src-or-bin="bin" basefile="${final.name}.zip" />
@@ -4497,40 +4494,18 @@ information.
     <compare-signatures num="2"  src-or-bin="bin" 
basefile="${final.name}-deployer.zip" />
     <compare-signatures num="3"  src-or-bin="bin" 
basefile="${final.name}-fulldocs.tar.gz" />
     <compare-signatures num="4"  src-or-bin="bin" 
basefile="${final.name}-windows-x64.zip" />
-    <compare-signatures num="5"  src-or-bin="bin" 
basefile="${final.name}-windows-x86.zip" />
     <compare-signatures num="6"  src-or-bin="bin" basefile="${final.name}.exe" 
/>
     <compare-signatures num="7"  src-or-bin="bin" 
basefile="${final.name}.tar.gz" />
     <compare-signatures num="8"  src-or-bin="bin" basefile="${final.name}.zip" 
/>
     <compare-signatures num="9"  src-or-bin="src" 
basefile="${final-src.name}.tar.gz" />
     <compare-signatures num="10" src-or-bin="src" 
basefile="${final-src.name}.zip" />
 
-<!--
-<echo>
-reproducible-1=${reproducible-1}
-reproducible-2=${reproducible-2}
-reproducible-3=${reproducible-3}
-reproducible-4=${reproducible-4}
-reproducible-5=${reproducible-5}
-reproducible-6=${reproducible-6}
-reproducible-7=${reproducible-7}
-reproducible-8=${reproducible-8}
-reproducible-9=${reproducible-9}
-reproducible-10=${reproducible-10}
-</echo>
--->
-
     <condition property="reproducible">
       <and>
         <isset property="reproducible-1" />
         <isset property="reproducible-2" />
-<!--
         <isset property="reproducible-3" />
--->
         <isset property="reproducible-4" />
-        <or>
-          <isset property="reproducible-5" />
-          <contains string="${version}" substring="12.0." /><!-- Super hack, 
Tomcat 12 does not produce x86 binaries. -->
-        </or>
         <isset property="reproducible-6" />
         <isset property="reproducible-7" />
         <isset property="reproducible-8" />
@@ -4541,7 +4516,6 @@ reproducible-10=${reproducible-10}
         <isset property="validsignature-2" />
         <isset property="validsignature-3" />
         <isset property="validsignature-4" />
-        <isset property="validsignature-5" />
         <isset property="validsignature-6" />
         <isset property="validsignature-7" />
         <isset property="validsignature-8" />


---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to