aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--coin/platform_configs/cmake_platforms.yaml2
-rw-r--r--coin/platform_configs/default.yaml2
-rw-r--r--coin/platform_configs/qtbase.yaml2
-rwxr-xr-xcoin/provisioning/qtci-linux-openSUSE-15.2-x86_64/01-install_telegraf.sh (renamed from coin/provisioning/qtci-linux-openSUSE-15.1-x86_64/01-install_telegraf.sh)0
-rwxr-xr-xcoin/provisioning/qtci-linux-openSUSE-15.2-x86_64/01-systemsetup.sh (renamed from coin/provisioning/qtci-linux-openSUSE-15.1-x86_64/01-systemsetup.sh)0
-rwxr-xr-xcoin/provisioning/qtci-linux-openSUSE-15.2-x86_64/02-disable-ntp.sh (renamed from coin/provisioning/qtci-linux-openSUSE-15.1-x86_64/02-disable-ntp.sh)0
-rwxr-xr-xcoin/provisioning/qtci-linux-openSUSE-15.2-x86_64/02-zypperpackages.sh (renamed from coin/provisioning/qtci-linux-openSUSE-15.1-x86_64/02-zypperpackages.sh)2
-rwxr-xr-xcoin/provisioning/qtci-linux-openSUSE-15.2-x86_64/08-libclang.sh (renamed from coin/provisioning/qtci-linux-openSUSE-15.1-x86_64/08-libclang.sh)0
-rwxr-xr-xcoin/provisioning/qtci-linux-openSUSE-15.2-x86_64/08-pythondev.sh (renamed from coin/provisioning/qtci-linux-openSUSE-15.1-x86_64/08-pythondev.sh)0
-rwxr-xr-xcoin/provisioning/qtci-linux-openSUSE-15.2-x86_64/09-cmake.sh (renamed from coin/provisioning/qtci-linux-openSUSE-15.1-x86_64/09-cmake.sh)0
-rwxr-xr-xcoin/provisioning/qtci-linux-openSUSE-15.2-x86_64/18-icc.sh (renamed from coin/provisioning/qtci-linux-openSUSE-15.1-x86_64/18-icc.sh)0
-rwxr-xr-xcoin/provisioning/qtci-linux-openSUSE-15.2-x86_64/20-sccache.sh (renamed from coin/provisioning/qtci-linux-openSUSE-15.1-x86_64/20-sccache.sh)0
-rwxr-xr-xcoin/provisioning/qtci-linux-openSUSE-15.2-x86_64/22-mqtt_broker.sh (renamed from coin/provisioning/qtci-linux-openSUSE-15.1-x86_64/22-mqtt_broker.sh)0
-rwxr-xr-xcoin/provisioning/qtci-linux-openSUSE-15.2-x86_64/55-emsdk.sh (renamed from coin/provisioning/qtci-linux-openSUSE-15.1-x86_64/55-emsdk.sh)0
-rwxr-xr-xcoin/provisioning/qtci-linux-openSUSE-15.2-x86_64/70-install_QemuGA.sh (renamed from coin/provisioning/qtci-linux-openSUSE-15.1-x86_64/70-install_QemuGA.sh)0
-rwxr-xr-xcoin/provisioning/qtci-linux-openSUSE-15.2-x86_64/90-squish.sh (renamed from coin/provisioning/qtci-linux-openSUSE-15.1-x86_64/90-squish.sh)0
-rwxr-xr-xcoin/provisioning/qtci-linux-openSUSE-15.2-x86_64/99-unset-proxy.sh (renamed from coin/provisioning/qtci-linux-openSUSE-15.1-x86_64/99-unset-proxy.sh)0
-rwxr-xr-xcoin/provisioning/qtci-linux-openSUSE-15.2-x86_64/99-version.sh (renamed from coin/provisioning/qtci-linux-openSUSE-15.1-x86_64/99-version.sh)0
18 files changed, 4 insertions, 4 deletions
diff --git a/coin/platform_configs/cmake_platforms.yaml b/coin/platform_configs/cmake_platforms.yaml
index 7a4a34de..c8da98d3 100644
--- a/coin/platform_configs/cmake_platforms.yaml
+++ b/coin/platform_configs/cmake_platforms.yaml
@@ -37,7 +37,7 @@ Configurations:
Environment variables: ['NON_QTBASE_CONFIGURE_ARGS=-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache',
'TEST_CONFIGURE_ARGS=-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache']
-
- Template: 'qtci-linux-openSUSE-15.1-x86_64'
+ Template: 'qtci-linux-openSUSE-15.2-x86_64-50'
Compiler: 'GCC'
Features: ['Sccache', 'InsignificantTests']
Configure arguments: '-DBUILD_EXAMPLES=OFF -FEATURE_developer_build=ON -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache'
diff --git a/coin/platform_configs/default.yaml b/coin/platform_configs/default.yaml
index 593154a8..09120a3a 100644
--- a/coin/platform_configs/default.yaml
+++ b/coin/platform_configs/default.yaml
@@ -21,7 +21,7 @@ Configurations:
Features: ['OutOfSourceBuild', 'Documentation', 'UseLegacyInstructions']
Configure arguments: '-qmake -opensource -confirm-license -verbose -prefix /home/qt/work/install -developer-build -no-warnings-are-errors -nomake tests -R . -qtlibinfix TestInfix -qtnamespace TestNamespace -openssl'
-
- Template: 'qtci-linux-openSUSE-15.1-x86_64'
+ Template: 'qtci-linux-openSUSE-15.2-x86_64-50'
Target os: 'WebAssembly'
Compiler: 'GCC'
Features: ['DisableTests', 'UseLegacyInstructions']
diff --git a/coin/platform_configs/qtbase.yaml b/coin/platform_configs/qtbase.yaml
index ec84991c..56ac5748 100644
--- a/coin/platform_configs/qtbase.yaml
+++ b/coin/platform_configs/qtbase.yaml
@@ -2,7 +2,7 @@ Version: 2
Include: [cmake_platforms.yaml]
Configurations:
-
- Template: 'qtci-linux-openSUSE-15.1-x86_64'
+ Template: 'qtci-linux-openSUSE-15.2-x86_64-50'
Target os: 'WebAssembly'
Compiler: 'GCC'
Features: ['DisableTests', 'UseLegacyInstructions']
diff --git a/coin/provisioning/qtci-linux-openSUSE-15.1-x86_64/01-install_telegraf.sh b/coin/provisioning/qtci-linux-openSUSE-15.2-x86_64/01-install_telegraf.sh
index 729f9003..729f9003 100755
--- a/coin/provisioning/qtci-linux-openSUSE-15.1-x86_64/01-install_telegraf.sh
+++ b/coin/provisioning/qtci-linux-openSUSE-15.2-x86_64/01-install_telegraf.sh
diff --git a/coin/provisioning/qtci-linux-openSUSE-15.1-x86_64/01-systemsetup.sh b/coin/provisioning/qtci-linux-openSUSE-15.2-x86_64/01-systemsetup.sh
index d3724ceb..d3724ceb 100755
--- a/coin/provisioning/qtci-linux-openSUSE-15.1-x86_64/01-systemsetup.sh
+++ b/coin/provisioning/qtci-linux-openSUSE-15.2-x86_64/01-systemsetup.sh
diff --git a/coin/provisioning/qtci-linux-openSUSE-15.1-x86_64/02-disable-ntp.sh b/coin/provisioning/qtci-linux-openSUSE-15.2-x86_64/02-disable-ntp.sh
index 38707a8a..38707a8a 100755
--- a/coin/provisioning/qtci-linux-openSUSE-15.1-x86_64/02-disable-ntp.sh
+++ b/coin/provisioning/qtci-linux-openSUSE-15.2-x86_64/02-disable-ntp.sh
diff --git a/coin/provisioning/qtci-linux-openSUSE-15.1-x86_64/02-zypperpackages.sh b/coin/provisioning/qtci-linux-openSUSE-15.2-x86_64/02-zypperpackages.sh
index 87afa41a..5c13b017 100755
--- a/coin/provisioning/qtci-linux-openSUSE-15.1-x86_64/02-zypperpackages.sh
+++ b/coin/provisioning/qtci-linux-openSUSE-15.2-x86_64/02-zypperpackages.sh
@@ -32,7 +32,7 @@ sudo zypper -nq install xcb-util-devel xcb-util-image-devel xcb-util-keysyms-dev
xcb-util-wm-devel xcb-util-renderutil-devel
# ICU
-sudo zypper -nq install libicu-devel libicu60_2
+sudo zypper -nq install libicu-devel
# qtwebengine
sudo zypper -nq install alsa-devel dbus-1-devel \
diff --git a/coin/provisioning/qtci-linux-openSUSE-15.1-x86_64/08-libclang.sh b/coin/provisioning/qtci-linux-openSUSE-15.2-x86_64/08-libclang.sh
index bbe2b4b4..bbe2b4b4 100755
--- a/coin/provisioning/qtci-linux-openSUSE-15.1-x86_64/08-libclang.sh
+++ b/coin/provisioning/qtci-linux-openSUSE-15.2-x86_64/08-libclang.sh
diff --git a/coin/provisioning/qtci-linux-openSUSE-15.1-x86_64/08-pythondev.sh b/coin/provisioning/qtci-linux-openSUSE-15.2-x86_64/08-pythondev.sh
index ab966a02..ab966a02 100755
--- a/coin/provisioning/qtci-linux-openSUSE-15.1-x86_64/08-pythondev.sh
+++ b/coin/provisioning/qtci-linux-openSUSE-15.2-x86_64/08-pythondev.sh
diff --git a/coin/provisioning/qtci-linux-openSUSE-15.1-x86_64/09-cmake.sh b/coin/provisioning/qtci-linux-openSUSE-15.2-x86_64/09-cmake.sh
index 5eb53566..5eb53566 100755
--- a/coin/provisioning/qtci-linux-openSUSE-15.1-x86_64/09-cmake.sh
+++ b/coin/provisioning/qtci-linux-openSUSE-15.2-x86_64/09-cmake.sh
diff --git a/coin/provisioning/qtci-linux-openSUSE-15.1-x86_64/18-icc.sh b/coin/provisioning/qtci-linux-openSUSE-15.2-x86_64/18-icc.sh
index 2bf47639..2bf47639 100755
--- a/coin/provisioning/qtci-linux-openSUSE-15.1-x86_64/18-icc.sh
+++ b/coin/provisioning/qtci-linux-openSUSE-15.2-x86_64/18-icc.sh
diff --git a/coin/provisioning/qtci-linux-openSUSE-15.1-x86_64/20-sccache.sh b/coin/provisioning/qtci-linux-openSUSE-15.2-x86_64/20-sccache.sh
index b371d947..b371d947 100755
--- a/coin/provisioning/qtci-linux-openSUSE-15.1-x86_64/20-sccache.sh
+++ b/coin/provisioning/qtci-linux-openSUSE-15.2-x86_64/20-sccache.sh
diff --git a/coin/provisioning/qtci-linux-openSUSE-15.1-x86_64/22-mqtt_broker.sh b/coin/provisioning/qtci-linux-openSUSE-15.2-x86_64/22-mqtt_broker.sh
index e677427f..e677427f 100755
--- a/coin/provisioning/qtci-linux-openSUSE-15.1-x86_64/22-mqtt_broker.sh
+++ b/coin/provisioning/qtci-linux-openSUSE-15.2-x86_64/22-mqtt_broker.sh
diff --git a/coin/provisioning/qtci-linux-openSUSE-15.1-x86_64/55-emsdk.sh b/coin/provisioning/qtci-linux-openSUSE-15.2-x86_64/55-emsdk.sh
index 44cf1b80..44cf1b80 100755
--- a/coin/provisioning/qtci-linux-openSUSE-15.1-x86_64/55-emsdk.sh
+++ b/coin/provisioning/qtci-linux-openSUSE-15.2-x86_64/55-emsdk.sh
diff --git a/coin/provisioning/qtci-linux-openSUSE-15.1-x86_64/70-install_QemuGA.sh b/coin/provisioning/qtci-linux-openSUSE-15.2-x86_64/70-install_QemuGA.sh
index ef37af1c..ef37af1c 100755
--- a/coin/provisioning/qtci-linux-openSUSE-15.1-x86_64/70-install_QemuGA.sh
+++ b/coin/provisioning/qtci-linux-openSUSE-15.2-x86_64/70-install_QemuGA.sh
diff --git a/coin/provisioning/qtci-linux-openSUSE-15.1-x86_64/90-squish.sh b/coin/provisioning/qtci-linux-openSUSE-15.2-x86_64/90-squish.sh
index e4281588..e4281588 100755
--- a/coin/provisioning/qtci-linux-openSUSE-15.1-x86_64/90-squish.sh
+++ b/coin/provisioning/qtci-linux-openSUSE-15.2-x86_64/90-squish.sh
diff --git a/coin/provisioning/qtci-linux-openSUSE-15.1-x86_64/99-unset-proxy.sh b/coin/provisioning/qtci-linux-openSUSE-15.2-x86_64/99-unset-proxy.sh
index 5ff78055..5ff78055 100755
--- a/coin/provisioning/qtci-linux-openSUSE-15.1-x86_64/99-unset-proxy.sh
+++ b/coin/provisioning/qtci-linux-openSUSE-15.2-x86_64/99-unset-proxy.sh
diff --git a/coin/provisioning/qtci-linux-openSUSE-15.1-x86_64/99-version.sh b/coin/provisioning/qtci-linux-openSUSE-15.2-x86_64/99-version.sh
index 03565da2..03565da2 100755
--- a/coin/provisioning/qtci-linux-openSUSE-15.1-x86_64/99-version.sh
+++ b/coin/provisioning/qtci-linux-openSUSE-15.2-x86_64/99-version.sh