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/Jenkins/Linux_rel_master.conf | |
| parent | uitest: replace sleep with processEventsToIdle (diff) | |
| download | core-6cd885b46bf168a1fe0d91231a1b6d283f813ed3.tar.gz core-6cd885b46bf168a1fe0d91231a1b6d283f813ed3.zip | |
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/Jenkins/Linux_rel_master.conf')
| -rw-r--r-- | distro-configs/Jenkins/Linux_rel_master.conf | 1 |
1 files changed, 1 insertions, 0 deletions
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++ |