diff options
| author | Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> | 2020-05-26 13:01:07 +0200 |
|---|---|---|
| committer | Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> | 2020-05-26 15:53:18 +0200 |
| commit | 6cd885b46bf168a1fe0d91231a1b6d283f813ed3 (patch) | |
| tree | 3726ff68d29d06fab0db143d781aa167985206db /distro-configs | |
| parent | a38a97ff07a4d088bad18a08012973a3344301be (diff) | |
jenkins linux configs: use jdk 11 for master
mac uses /usr/libexec/java_home to determine jdk and without -v option
to limit to a specific version returns latest one
Change-Id: I8c8122ed71a31f990c3ffa1e71b180cbece7f172
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/94862
Tested-by: Jenkins
Tested-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
Diffstat (limited to 'distro-configs')
| -rw-r--r-- | distro-configs/Jenkins/LibreOfficeLinuxUpdater.conf | 1 | ||||
| -rw-r--r-- | distro-configs/Jenkins/Linux_dev_master.conf | 1 | ||||
| -rw-r--r-- | distro-configs/Jenkins/Linux_rel_master.conf | 1 | ||||
| -rw-r--r-- | distro-configs/Jenkins/Linux_ubsan_master.conf | 1 | ||||
| -rw-r--r-- | distro-configs/Jenkins/linux_clang_dbgutil_64 | 1 | ||||
| -rw-r--r-- | distro-configs/Jenkins/linux_gcc_release_64 | 1 | ||||
| -rw-r--r-- | distro-configs/Jenkins/linux_random.conf | 1 | ||||
| -rw-r--r-- | distro-configs/Jenkins/screenshot_linux.conf | 1 |
8 files changed, 8 insertions, 0 deletions
diff --git a/distro-configs/Jenkins/LibreOfficeLinuxUpdater.conf b/distro-configs/Jenkins/LibreOfficeLinuxUpdater.conf index 51d536fae245..1f6ac36747de 100644 --- a/distro-configs/Jenkins/LibreOfficeLinuxUpdater.conf +++ b/distro-configs/Jenkins/LibreOfficeLinuxUpdater.conf @@ -33,3 +33,4 @@ --with-lang=de es fr ar zh-CN --with-package-format=archive --with-update-config=~/updater.ini +--with-jdk-home=/etc/alternatives/java_sdk_11 diff --git a/distro-configs/Jenkins/Linux_dev_master.conf b/distro-configs/Jenkins/Linux_dev_master.conf index 0f997e12ff29..f8919a0804fe 100644 --- a/distro-configs/Jenkins/Linux_dev_master.conf +++ b/distro-configs/Jenkins/Linux_dev_master.conf @@ -1,4 +1,5 @@ --enable-dbgutil --enable-kf5 +--with-jdk-home=/etc/alternatives/java_sdk_11 CC=/opt/rh/devtoolset-7/root/usr/bin/gcc CXX=/opt/rh/devtoolset-7/root/usr/bin/g++ diff --git a/distro-configs/Jenkins/Linux_rel_master.conf b/distro-configs/Jenkins/Linux_rel_master.conf index 23b105fbe6b8..988dff770063 100644 --- a/distro-configs/Jenkins/Linux_rel_master.conf +++ b/distro-configs/Jenkins/Linux_rel_master.conf @@ -1,3 +1,4 @@ --enable-kf5 +--with-jdk-home=/etc/alternatives/java_sdk_11 CC=/opt/rh/devtoolset-7/root/usr/bin/gcc CXX=/opt/rh/devtoolset-7/root/usr/bin/g++ diff --git a/distro-configs/Jenkins/Linux_ubsan_master.conf b/distro-configs/Jenkins/Linux_ubsan_master.conf index da751f0a6cc5..8e7f80550774 100644 --- a/distro-configs/Jenkins/Linux_ubsan_master.conf +++ b/distro-configs/Jenkins/Linux_ubsan_master.conf @@ -26,3 +26,4 @@ --with-system-cairo --disable-compiler-plugins --disable-gtk3 +--with-jdk-home=/etc/alternatives/java_sdk_11 diff --git a/distro-configs/Jenkins/linux_clang_dbgutil_64 b/distro-configs/Jenkins/linux_clang_dbgutil_64 index 4c38a41e572e..b67352cede47 100644 --- a/distro-configs/Jenkins/linux_clang_dbgutil_64 +++ b/distro-configs/Jenkins/linux_clang_dbgutil_64 @@ -5,3 +5,4 @@ COMPILER_PLUGINS_CXX=ccache g++ -std=c++11 --disable-compiler-plugins-analyzer-pch --disable-dependency-tracking --disable-split-debug +--with-jdk-home=/etc/alternatives/java_sdk_11 diff --git a/distro-configs/Jenkins/linux_gcc_release_64 b/distro-configs/Jenkins/linux_gcc_release_64 index b3e133f1cb2f..547b97a0de25 100644 --- a/distro-configs/Jenkins/linux_gcc_release_64 +++ b/distro-configs/Jenkins/linux_gcc_release_64 @@ -2,3 +2,4 @@ CC=/opt/rh/devtoolset-7/root/usr/bin/gcc CXX=/opt/rh/devtoolset-7/root/usr/bin/g++ --enable-kf5 --disable-dependency-tracking +--with-jdk-home=/etc/alternatives/java_sdk_11 diff --git a/distro-configs/Jenkins/linux_random.conf b/distro-configs/Jenkins/linux_random.conf index 4e71d38533f8..c4f546e02a43 100644 --- a/distro-configs/Jenkins/linux_random.conf +++ b/distro-configs/Jenkins/linux_random.conf @@ -1 +1,2 @@ --enable-fuzz-options +--with-jdk-home=/etc/alternatives/java_sdk_11 diff --git a/distro-configs/Jenkins/screenshot_linux.conf b/distro-configs/Jenkins/screenshot_linux.conf index f93c7a7d1166..aedde6c747fa 100644 --- a/distro-configs/Jenkins/screenshot_linux.conf +++ b/distro-configs/Jenkins/screenshot_linux.conf @@ -1 +1,2 @@ --with-lang=ALL +--with-jdk-home=/etc/alternatives/java_sdk_11 |