diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2018-11-25 17:45:54 +0100 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2018-12-10 11:56:03 +0100 |
commit | ed81fe44d4e6b36c4c61a22e9e28a3a94fef9238 (patch) | |
tree | 0cff9f9b7a53ca26b7527c88abadbf91c3aa6789 /distro-configs | |
parent | acbd2433493997f238c4787653d8d3f80f648360 (diff) |
Enabling Developer Toolset 7 for Jenkins' remaining GCC master jobs
...now that gandalf (which all of these jobs may run on) has been updated (see
d27d75f86cf8ea4fd87e2cd64b58cc8c0ac0029a "Revert 'Enabling Developer Toolset 7
for Jenkins' lo_tb_random_config_linux'"):
* <https://ci.libreoffice.org/job/lo_daily_update_gandalf/> aka
"lo_daily_update_gandalf", configured with
--distro-config="LibreOfficeLinuxUpdater"
* <https://ci.libreoffice.org/job/lo_tb_ui_testing_linux/> aka
"lo_tb_ui_testing_linux", configued with --distro-config="rel_master"
* <https://ci.libreoffice.org/job/lo_tb_master_linux/> aka "Tinderbox on Master
for Linux", configured with --distro-config="rel_master"
Change-Id: If8afe079cc45e06ea95124e56fa974fd3aca2c78
Reviewed-on: https://gerrit.libreoffice.org/63991
Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Tested-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'distro-configs')
-rw-r--r-- | distro-configs/Jenkins/LibreOfficeLinuxUpdater.conf | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/distro-configs/Jenkins/LibreOfficeLinuxUpdater.conf b/distro-configs/Jenkins/LibreOfficeLinuxUpdater.conf index 810ef33a62da..f006518ce0c8 100644 --- a/distro-configs/Jenkins/LibreOfficeLinuxUpdater.conf +++ b/distro-configs/Jenkins/LibreOfficeLinuxUpdater.conf @@ -32,3 +32,5 @@ --with-lang=de es fr ar zh-CN --with-package-format=archive --with-update-config=~/updater.ini +CC=/opt/rh/devtoolset-7/root/usr/bin/gcc +CXX=/opt/rh/devtoolset-7/root/usr/bin/g++ |