Merge commit '415527935e4605f44239165c0018ce9b8ca14970' into pyside6.0

Change-Id: I17ebe2f4c1e04dde7401c0a8a0afeac1dcd93915
2026-03-23 06:41:06 +08:00 · 2021-04-29 13:30:35 +03:00
parent 5a8d37b64d 415527935e
commit 9e385191b1
21 changed files with 22 additions and 22 deletions
--- a/coin/provisioning/common/macos/nodejs.sh
+++ b/coin/provisioning/common/macos/nodejs.sh
@@ -43,8 +43,8 @@ urlCache="http://ci-files01-hki.ci.local/input/nodejs/node-v$version.pkg"
 urlOffcial="https://nodejs.org/dist/v$version/node-v$version.pkg"
 sha1="4720274971c40fe51b2c647060f77c45fb4949a7"

-DownloadURL $urlCache $urlOffcial $sha1 "/tmp"
-sudo installer -pkg node-v$version.pkg -target /
+DownloadURL $urlCache $urlOffcial $sha1 "/tmp/node-v$version.pkg"
+sudo installer -pkg "/tmp/node-v$version.pkg" -target /

 echo "Nodejs = $version" >> ~/versions.txt

--- a/coin/provisioning/qtci-linux-CentOS-8.3-x86_64/03-install-gcc-toolset.sh
+++ b/coin/provisioning/qtci-linux-CentOS-8.3-x86_64/03-install-gcc-toolset.sh
@@ -37,5 +37,5 @@ set -ex

 sudo yum -y install gcc-toolset-9

-echo "source /opt/rh/gcc-toolset-10/enable" >> ~/.bashrc
+echo "source /opt/rh/gcc-toolset-9/enable" >> ~/.bashrc

--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2