diff options
| -rw-r--r-- | coin/platform_configs/default.yaml | 18 | ||||
| -rwxr-xr-x | coin/provisioning/common/unix/install_protobuff.sh | 2 | ||||
| -rwxr-xr-x | coin/provisioning/qtci-linux-RHEL-7.6-x86_64/03-install-devtoolset.sh | 4 | ||||
| -rwxr-xr-x | coin/provisioning/qtci-linux-RHEL-7.6-x86_64/04-install-packages.sh | 12 | ||||
| -rwxr-xr-x | coin/provisioning/qtci-linux-RHEL-7.6-x86_64/40-install-cmake.sh (renamed from coin/provisioning/qtci-linux-RHEL-7.6-x86_64/06-cmake.sh) | 0 |
5 files changed, 28 insertions, 8 deletions
diff --git a/coin/platform_configs/default.yaml b/coin/platform_configs/default.yaml index dab36910..0e3aefa6 100644 --- a/coin/platform_configs/default.yaml +++ b/coin/platform_configs/default.yaml @@ -1,12 +1,22 @@ -- Template: 'qtci-linux-Ubuntu-18.04-x86_64' +Version: 2 +Configurations: +- + Template: 'qtci-linux-Ubuntu-18.04-x86_64' Compiler: 'GCC' Configure arguments: '-DBUILD_EXAMPLES=ON -DFEATURE_developer_build=ON' -- Template: 'qtci-linux-openSUSE-15.0-x86_64' +- + Template: 'qtci-linux-openSUSE-15.0-x86_64' Compiler: 'ICC_18' Configure arguments: '-DBUILD_EXAMPLES=OFF -DBUILD_SHARED_LIBS=OFF' -- Template: 'qtci-macos-10.13-x86_64-2' +- + Template: 'qtci-macos-10.13-x86_64-2' Compiler: 'Clang' Configure arguments: '-DBUILD_EXAMPLES=OFF -DCMAKE_OSX_SYSROOT:PATH=/Applications/Xcode10.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.14.sdk -DCMAKE_OSX_DEPLOYMENT_TARGET=10.12' -- Template: 'qtci-windows-10-x86_64-14' +- + Template: 'qtci-windows-10-x86_64-14' Compiler: 'MSVC2017' Configure arguments: '-DBUILD_EXAMPLES=OFF -DCMAKE_TOOLCHAIN_FILE={{.Env.VCPKG_ROOT}}/scripts/buildsystems/vcpkg.cmake' +- + Template: 'qtci-linux-RHEL-7.6-x86_64' + Compiler: 'GCC' + Configure arguments: '-DBUILD_EXAMPLES=OFF' diff --git a/coin/provisioning/common/unix/install_protobuff.sh b/coin/provisioning/common/unix/install_protobuff.sh index 59e9b699..20e9ab44 100755 --- a/coin/provisioning/common/unix/install_protobuff.sh +++ b/coin/provisioning/common/unix/install_protobuff.sh @@ -53,7 +53,7 @@ sudo rm "$targetFile" # devtoolset is needed when running configuration if uname -a |grep -qv "Darwin"; then - export PATH="/opt/rh/devtoolset-4/root/usr/bin:$PATH" + export PATH="/opt/rh/devtoolset-7/root/usr/bin:$PATH" fi echo "Configuring and building protobuf" diff --git a/coin/provisioning/qtci-linux-RHEL-7.6-x86_64/03-install-devtoolset.sh b/coin/provisioning/qtci-linux-RHEL-7.6-x86_64/03-install-devtoolset.sh index ebc7cac6..5d37a53a 100755 --- a/coin/provisioning/qtci-linux-RHEL-7.6-x86_64/03-install-devtoolset.sh +++ b/coin/provisioning/qtci-linux-RHEL-7.6-x86_64/03-install-devtoolset.sh @@ -35,7 +35,7 @@ set -ex -sudo yum -y install devtoolset-4 +sudo yum -y install devtoolset-7 -echo "source /opt/rh/devtoolset-4/enable" >> ~/.bashrc +echo "source /opt/rh/devtoolset-7/enable" >> ~/.bashrc diff --git a/coin/provisioning/qtci-linux-RHEL-7.6-x86_64/04-install-packages.sh b/coin/provisioning/qtci-linux-RHEL-7.6-x86_64/04-install-packages.sh index b956d6a3..6b569552 100755 --- a/coin/provisioning/qtci-linux-RHEL-7.6-x86_64/04-install-packages.sh +++ b/coin/provisioning/qtci-linux-RHEL-7.6-x86_64/04-install-packages.sh @@ -38,13 +38,20 @@ set -ex # Remove update notifications and packagekit running in the background sudo yum -y remove PackageKit gnome-software +sudo yum-config-manager --enable rhel-server-rhscl-7-rpms + installPackages=() -installPackages+=(git) +installPackages+=(rh-git29) installPackages+=(zlib-devel) installPackages+=(glib2-devel) installPackages+=(openssl-devel) installPackages+=(freetype-devel) installPackages+=(fontconfig-devel) +# cmake build +installPackages+=(ninja-build) +installPackages+=(pcre2-devel) +installPackages+=(double-conversion-devel) +installPackages+=(zstd) # EGL support installPackages+=(mesa-libEGL-devel) installPackages+=(mesa-libGL-devel) @@ -118,6 +125,9 @@ installPackages+=(vulkan-devel) sudo yum -y install "${installPackages[@]}" +scl enable rh-git29 bash +sudo ln -s /opt/rh/rh-git29/root/usr/bin/git /usr/local/bin/git + sudo ln -s /opt/rh/rh-python36/root/usr/bin/python3 /usr/local/bin/python3 sudo ln -s /opt/rh/rh-python36/root/usr/bin/pip3 /usr/local/bin/pip3 # We shouldn't use yum to install virtualenv. The one found from package repo is not diff --git a/coin/provisioning/qtci-linux-RHEL-7.6-x86_64/06-cmake.sh b/coin/provisioning/qtci-linux-RHEL-7.6-x86_64/40-install-cmake.sh index 062b2790..062b2790 100755 --- a/coin/provisioning/qtci-linux-RHEL-7.6-x86_64/06-cmake.sh +++ b/coin/provisioning/qtci-linux-RHEL-7.6-x86_64/40-install-cmake.sh |