Skip to content

Commit 5ed4675

Browse files
committed
Removing jansi jar from WDT distribution
1 parent 0258300 commit 5ed4675

File tree

1 file changed

+14
-1
lines changed

1 file changed

+14
-1
lines changed

Jenkinsfile

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -208,7 +208,7 @@ pipeline {
208208
}
209209
}
210210
stage('MacOS Build') {
211-
agent { label('macosx') }
211+
agent { label('macosx&&!wls-hudson-mac') }
212212
options {
213213
timeout(time: 300, unit: 'MINUTES')
214214
}
@@ -297,11 +297,24 @@ pipeline {
297297
// }
298298
}
299299
stage('MacOS Build Installers') {
300+
// WDT 4.0 introduced a dependency on JLine, which depends on the jansi JAR file that
301+
// includes native code. The Apple notarization process chokes on this jar because its
302+
// contains an unsigned native code library. Since JLine is only used by modelHelp and
303+
// modelHelp currently isn't used by WKTUI, we are going to delete the jansi.jar file from
304+
// the WKTUI build to allow the Apple notarization process to succeed.
305+
//
306+
// Even if we sign the code properly for the release, any updates of WDT from within WKTUI
307+
// will download new versions directly from GitHub that are not signed, which would prevent
308+
// JLine from working from within WKTUI. If we ever need to make this work correctly within
309+
// WKTUI, we should have the WDT build/release process sign the native code in the jansi JAR
310+
// the WDT installer includes so that WKTUI would never have an unsigned version of the JAR.
311+
//
300312
steps {
301313
sh '''
302314
cd "${WORKSPACE}/electron"
303315
PATH="${mac_node_dir}/bin:$PATH" HTTPS_PROXY=${WKTUI_PROXY} CSC_IDENTITY_AUTO_DISCOVERY=false ${mac_npm_exe} run build:jet
304316
PATH="${mac_node_dir}/bin:$PATH" HTTPS_PROXY=${WKTUI_PROXY} CSC_IDENTITY_AUTO_DISCOVERY=false ${mac_npm_exe} run install-tools
317+
rm "${WORKSPACE}/tools/weblogic-deploy/lib/jansi-*.jar"
305318
PATH="${mac_node_dir}/bin:$PATH" HTTPS_PROXY=${WKTUI_PROXY} CSC_IDENTITY_AUTO_DISCOVERY=false ${mac_npm_exe} run build:installer -- --mac --x64 --arm64
306319
cd "${WORKSPACE}"
307320
'''

0 commit comments

Comments
 (0)