Skip to content

Commit dbd3424

Browse files
committed
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.
1 parent c4706cc commit dbd3424

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

build-aux/Jenkinsfile.full

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -120,14 +120,12 @@ meta = [
120120
gnu_make: 'gmake'
121121
],
122122

123-
// Excluding clouseau for macos. This stopped working as
124-
// of https://github.com/apache/couchdb/pull/5180 (bump to 2.23.1)
125-
// but works for the other workers.
126123
'macos': [
127124
name: 'macOS',
128125
spidermonkey_vsn: '128',
129126
with_nouveau: false,
130-
with_clouseau: false,
127+
with_clouseau: true,
128+
clouseau_java_home: '/opt/java/openjdk8/zulu-8.jre/Contents/Home',
131129
gnu_make: 'make'
132130
],
133131

@@ -180,7 +178,9 @@ def generateNativeStage(platform) {
180178
withEnv([
181179
'HOME='+pwd(),
182180
'PATH+USRLOCAL=/usr/local/bin',
183-
'MAKE='+meta[platform].gnu_make
181+
'PATH+ERTS=/opt/homebrew/lib/erlang/bin',
182+
'MAKE='+meta[platform].gnu_make,
183+
'CLOUSEAU_JAVA_HOME='+meta[platform].clouseau_java_home ?: ''
184184
]) {
185185
sh( script: "mkdir -p ${platform}/build", label: 'Create build directories' )
186186
sh( script: "tar -xf apache-couchdb-*.tar.gz -C ${platform}/build --strip-components=1", label: 'Unpack release' )

0 commit comments

Comments
 (0)