This is an automated email from the ASF dual-hosted git repository.
pgj pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/couchdb.git
The following commit(s) were added to refs/heads/main by this push:
new dbd342485 Enable Clouseau for macOS
dbd342485 is described below
commit dbd34248587378ddb7b40270e9012d3b4c36dc36
Author: Gabor Pali <[email protected]>
AuthorDate: Tue Mar 25 17:06:28 2025 +0100
Enable Clouseau for macOS
The macOS worker has Java 8 installed but it could not be
leveraged because it was not configured through the
`CLOUSEAU_JAVA_HOME` environment variable. Address this gap and
un-break running Clouseau on that platform as well.
---
build-aux/Jenkinsfile.full | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/build-aux/Jenkinsfile.full b/build-aux/Jenkinsfile.full
index 6966e6f8f..736e7c4ea 100644
--- a/build-aux/Jenkinsfile.full
+++ b/build-aux/Jenkinsfile.full
@@ -120,14 +120,12 @@ meta = [
gnu_make: 'gmake'
],
- // Excluding clouseau for macos. This stopped working as
- // of https://github.com/apache/couchdb/pull/5180 (bump to 2.23.1)
- // but works for the other workers.
'macos': [
name: 'macOS',
spidermonkey_vsn: '128',
with_nouveau: false,
- with_clouseau: false,
+ with_clouseau: true,
+ clouseau_java_home: '/opt/java/openjdk8/zulu-8.jre/Contents/Home',
gnu_make: 'make'
],
@@ -180,7 +178,9 @@ def generateNativeStage(platform) {
withEnv([
'HOME='+pwd(),
'PATH+USRLOCAL=/usr/local/bin',
- 'MAKE='+meta[platform].gnu_make
+ 'PATH+ERTS=/opt/homebrew/lib/erlang/bin',
+ 'MAKE='+meta[platform].gnu_make,
+ 'CLOUSEAU_JAVA_HOME='+meta[platform].clouseau_java_home ?: ''
]) {
sh( script: "mkdir -p ${platform}/build", label: 'Create build
directories' )
sh( script: "tar -xf apache-couchdb-*.tar.gz -C
${platform}/build --strip-components=1", label: 'Unpack release' )
