This is an automated email from the ASF dual-hosted git repository. vatamane pushed a commit to branch fix-rpm-builds in repository https://gitbox.apache.org/repos/asf/couchdb-ci.git
commit b8a472725bbda1874d0f2b7d474aa663443f29d5 Author: Nick Vatamaniuc <[email protected]> AuthorDate: Sat Feb 21 11:51:49 2026 -0500 Use built-in zlib for erlang Otherwise some distros like Almalinux use zlib-ng which may be faster and better but it produces slightly different compression lengths for attachments in some tests. Also cleanup unused couseau_java_home var. We don't set a java_home so the clouseau one is also undefined. --- bin/source-erlang.sh | 1 + dockerfiles/almalinux-10 | 5 ----- dockerfiles/almalinux-8 | 5 ----- dockerfiles/almalinux-9 | 5 ----- 4 files changed, 1 insertion(+), 15 deletions(-) diff --git a/bin/source-erlang.sh b/bin/source-erlang.sh index 45b7386..3d461bc 100755 --- a/bin/source-erlang.sh +++ b/bin/source-erlang.sh @@ -82,6 +82,7 @@ fi # Configure Erlang - skip building things we don't want or need ./configure \ + --enable-builtin-zlib \ --without-javac --without-wx --without-odbc \ --without-debugger --without-observer --without-et \ --without-diameter --without-megaco --without-tftp \ diff --git a/dockerfiles/almalinux-10 b/dockerfiles/almalinux-10 index cc1e995..03eb41a 100644 --- a/dockerfiles/almalinux-10 +++ b/dockerfiles/almalinux-10 @@ -21,11 +21,6 @@ FROM almalinux:10 # Java 21 installed via RPM: java-21-openjdk-devel -# These are needed for the Clouseau integration -# This is the same as for Nouveau for the moment, but perhaps it is better to -# keep it separate as there is no guarantee that they will be bumped at the -# same pace. -ENV CLOUSEAU_JAVA_HOME="${JAVA_HOME}" ENV PATH=/usr/local/lib/erlang/bin:"${PATH}" # Choose whether to install SpiderMonkey 1.8.5, default yes diff --git a/dockerfiles/almalinux-8 b/dockerfiles/almalinux-8 index 365fd94..c65397e 100644 --- a/dockerfiles/almalinux-8 +++ b/dockerfiles/almalinux-8 @@ -21,11 +21,6 @@ FROM almalinux:8 # Java 21 installed via RPM: java-21-openjdk-devel -# These are needed for the Clouseau integration -# This is the same as for Nouveau for the moment, but perhaps it is better to -# keep it separate as there is no guarantee that they will be bumped at the -# same pace. -ENV CLOUSEAU_JAVA_HOME="${JAVA_HOME}" ENV PATH=/usr/local/lib/erlang/bin:"${PATH}" # Choose whether to install SpiderMonkey 1.8.5, default yes diff --git a/dockerfiles/almalinux-9 b/dockerfiles/almalinux-9 index 567691e..22af708 100644 --- a/dockerfiles/almalinux-9 +++ b/dockerfiles/almalinux-9 @@ -21,11 +21,6 @@ FROM almalinux:9 # Java 21 installed via RPM: java-21-openjdk-devel -# These are needed for the Clouseau integration -# This is the same as for Nouveau for the moment, but perhaps it is better to -# keep it separate as there is no guarantee that they will be bumped at the -# same pace. -ENV CLOUSEAU_JAVA_HOME="${JAVA_HOME}" ENV PATH=/usr/local/lib/erlang/bin:"${PATH}" # Choose whether to install SpiderMonkey 1.8.5, default yes
