diff --git a/coin/provisioning/common/macos/nodejs.sh b/coin/provisioning/common/macos/nodejs.sh index b3728999..1313d27e 100755 --- 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 diff --git 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 index fbd1081d..54b9d774 100644 --- 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 diff --git a/qt3d b/qt3d index c7aa288f..22509ec5 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit c7aa288fd643463cec0d03b9cfb8c854b3839421 +Subproject commit 22509ec535e9c6883faa363c646b0ee1c1aa90e7 diff --git a/qt5compat b/qt5compat index 61aa6903..be973b7e 160000 --- a/qt5compat +++ b/qt5compat @@ -1 +1 @@ -Subproject commit 61aa690352b2d5b5a0e781b1938f7ea17e7d8d56 +Subproject commit be973b7ee7a93dcc13b61f773f25a0c1f9fee0db diff --git a/qtbase b/qtbase index e066c4d4..73621cbf 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit e066c4d4bf1a0008a1993802c4e5b97f8df974dc +Subproject commit 73621cbf0a5f53990b2c7a966bc6fd71299ec8fe diff --git a/qtcoap b/qtcoap index 618c330f..b2ad0574 160000 --- a/qtcoap +++ b/qtcoap @@ -1 +1 @@ -Subproject commit 618c330f084f9a60d56f20003197b66d7d64ec13 +Subproject commit b2ad0574b36a75ccea1dc794ec1b75b347ac0297 diff --git a/qtdeclarative b/qtdeclarative index 5b0a4213..77fd3a09 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 5b0a4213ce2fcd38e7a818fdc48635e7c19014e0 +Subproject commit 77fd3a0969e05f3741307afef8721aba7ee6c8c0 diff --git a/qtdoc b/qtdoc index 5dcb4a0c..9fc3cc14 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit 5dcb4a0caad00eab8df9cdb16880c2ed8b6a705c +Subproject commit 9fc3cc14f34861a94507d9d8bdbe1f5f64a21556 diff --git a/qtimageformats b/qtimageformats index a8ceead2..e5e4a89b 160000 --- a/qtimageformats +++ b/qtimageformats @@ -1 +1 @@ -Subproject commit a8ceead2aae26974b72a233779ececac36f28bf0 +Subproject commit e5e4a89ba59275e1f758029990a4311248095cf2 diff --git a/qtmqtt b/qtmqtt index 150e35d4..8c862dd2 160000 --- a/qtmqtt +++ b/qtmqtt @@ -1 +1 @@ -Subproject commit 150e35d48086d3fa488a4de9beb718713e731e08 +Subproject commit 8c862dd25d7940017dd4a6f124c3f9f7f44e7e02 diff --git a/qtnetworkauth b/qtnetworkauth index 1b24f8f4..7f01b77b 160000 --- a/qtnetworkauth +++ b/qtnetworkauth @@ -1 +1 @@ -Subproject commit 1b24f8f472548d815735f93e6e313d41dc0b1008 +Subproject commit 7f01b77b7c27a567440ee66a478ed0d7d318845d diff --git a/qtopcua b/qtopcua index 2131f674..a510d14c 160000 --- a/qtopcua +++ b/qtopcua @@ -1 +1 @@ -Subproject commit 2131f67494957519225ab3487f5a7201e7a9ce23 +Subproject commit a510d14c2fbc6c2f07dbeb1ffc5e536eec8f5ea5 diff --git a/qtqa b/qtqa index 4239183b..7e0965cb 160000 --- a/qtqa +++ b/qtqa @@ -1 +1 @@ -Subproject commit 4239183b2367db4f73f23ca0e5a2466d0aca2586 +Subproject commit 7e0965cb004e6e4cea7746b838fbd6334ea61d09 diff --git a/qtquick3d b/qtquick3d index 6978d2b8..28087235 160000 --- a/qtquick3d +++ b/qtquick3d @@ -1 +1 @@ -Subproject commit 6978d2b8b579a77abd5875d28fe61e3fada4eb8b +Subproject commit 28087235acfbcffb4172acaa06227244bc9fa75b diff --git a/qtquickcontrols2 b/qtquickcontrols2 index 06eefa58..3b4f4a5d 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit 06eefa58c987068651fc4bd0063d122178543696 +Subproject commit 3b4f4a5d4f70f35e256260cc4b5d6cae9c0dad66 diff --git a/qtquicktimeline b/qtquicktimeline index d40d4d2d..f1e06e4a 160000 --- a/qtquicktimeline +++ b/qtquicktimeline @@ -1 +1 @@ -Subproject commit d40d4d2d51af74f47ab8f21126e21966a8b1f778 +Subproject commit f1e06e4a16c8ae9ee97b655da32fa08039514163 diff --git a/qtshadertools b/qtshadertools index af1bdc7a..227f6a97 160000 --- a/qtshadertools +++ b/qtshadertools @@ -1 +1 @@ -Subproject commit af1bdc7aced7cce7406ad0db481261cc4c15a0ec +Subproject commit 227f6a9706eaccc41641873be01f406ba11ab708 diff --git a/qtsvg b/qtsvg index 3ea889f3..f1a74f5e 160000 --- a/qtsvg +++ b/qtsvg @@ -1 +1 @@ -Subproject commit 3ea889f30aa9bc63b938342412e33c7686053d35 +Subproject commit f1a74f5e68fc366259087ccd85ddf8087e89d265 diff --git a/qttools b/qttools index f00d0ad2..ec8d842b 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit f00d0ad23be576d2ccfa47ef2018344db1048035 +Subproject commit ec8d842b35032d41a2cd32689d5e83c1133f681c diff --git a/qttranslations b/qttranslations index b4b5adc4..83503740 160000 --- a/qttranslations +++ b/qttranslations @@ -1 +1 @@ -Subproject commit b4b5adc4d8aaf3529a63d0958e310bc11a6ce882 +Subproject commit 83503740913a3e095eef6a996b157297fc75a30e diff --git a/qtwayland b/qtwayland index 65d717a2..3d4cee05 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit 65d717a27a4917fe39c538067f7defbe115f2e83 +Subproject commit 3d4cee05a5642fdd6f1d43ff36cc53c5028a8966