From c1847f4f5be1f76085a68e79c40e8bd67f0c0e3d Mon Sep 17 00:00:00 2001 From: Amir Masoud Abdol Date: Tue, 14 Nov 2023 17:09:38 +0100 Subject: [PATCH] Provisioning: Install zip on Linux Vcpkg needs zip for compressing the build artifacts, etc. for caching. Task-number: QTBUG-115715 Change-Id: I1f0c056ca44a94ddfc181e6ce0213790e616e431 Reviewed-by: Alexandru Croitor --- .../qtci-linux-RHEL-8.8-x86_64/04-install-packages.sh | 2 ++ .../qtci-linux-RHEL-9.2-x86_64/04-install-packages.sh | 2 ++ .../qtci-linux-SLES-15_SP5-x86_64/02-zypperpackages.sh | 3 +++ .../qtci-linux-openSUSE-15.5-x86_64/04-zypperpackages.sh | 3 +++ 4 files changed, 10 insertions(+) diff --git a/coin/provisioning/qtci-linux-RHEL-8.8-x86_64/04-install-packages.sh b/coin/provisioning/qtci-linux-RHEL-8.8-x86_64/04-install-packages.sh index 01970876..9eb8ef7f 100755 --- a/coin/provisioning/qtci-linux-RHEL-8.8-x86_64/04-install-packages.sh +++ b/coin/provisioning/qtci-linux-RHEL-8.8-x86_64/04-install-packages.sh @@ -141,6 +141,8 @@ installPackages+=(keyutils) installPackages+=(cifs-utils) # used for reading vcpkg packages version, from vcpkg.json installPackages+=(jq) +# zip, needed for vcpkg caching +installPackages+=(zip) sudo yum -y install "${installPackages[@]}" diff --git a/coin/provisioning/qtci-linux-RHEL-9.2-x86_64/04-install-packages.sh b/coin/provisioning/qtci-linux-RHEL-9.2-x86_64/04-install-packages.sh index eef9b26b..1be3de5c 100755 --- a/coin/provisioning/qtci-linux-RHEL-9.2-x86_64/04-install-packages.sh +++ b/coin/provisioning/qtci-linux-RHEL-9.2-x86_64/04-install-packages.sh @@ -148,6 +148,8 @@ installPackages+=(keyutils) installPackages+=(cifs-utils) # used for reading vcpkg packages version, from vcpkg.json installPackages+=(jq) +# zip, needed for vcpkg caching +installPackages+=(zip) sudo yum -y install "${installPackages[@]}" diff --git a/coin/provisioning/qtci-linux-SLES-15_SP5-x86_64/02-zypperpackages.sh b/coin/provisioning/qtci-linux-SLES-15_SP5-x86_64/02-zypperpackages.sh index 012b841d..42383e1b 100644 --- a/coin/provisioning/qtci-linux-SLES-15_SP5-x86_64/02-zypperpackages.sh +++ b/coin/provisioning/qtci-linux-SLES-15_SP5-x86_64/02-zypperpackages.sh @@ -93,6 +93,9 @@ sudo zypper -nq install autoconf libcurl-devel libexpat-devel # used for reading vcpkg packages version, from vcpkg.json sudo zypper -nq install jq +# zip, needed for vcpkg caching +sudo zypper -nq install zip + # Nodejs - required by QtWebengine sudo zypper -nq install nodejs18 diff --git a/coin/provisioning/qtci-linux-openSUSE-15.5-x86_64/04-zypperpackages.sh b/coin/provisioning/qtci-linux-openSUSE-15.5-x86_64/04-zypperpackages.sh index f749962e..bcada865 100755 --- a/coin/provisioning/qtci-linux-openSUSE-15.5-x86_64/04-zypperpackages.sh +++ b/coin/provisioning/qtci-linux-openSUSE-15.5-x86_64/04-zypperpackages.sh @@ -63,6 +63,9 @@ sudo zypper -nq install make # Tools to build Git sudo zypper -nq install autoconf libcurl-devel libexpat-devel +# zip, needed for vcpkg caching +sudo zypper -nq install zip + # OpenSSL 3 sudo zypper -nq install openssl-3