From d06d1081c0553fbfd304b69dd5f9c591194f522a Mon Sep 17 00:00:00 2001 From: Heikki Halmet Date: Fri, 1 Dec 2017 09:34:56 +0200 Subject: [PATCH 1/5] Provisioning: Install Devtoolset-4 to Rhel 7.4 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Gcc need to be downgraded from 6 to 5, because Gcc 6 is too new for the latest Ubuntu LTS (16.04). This means Devtoolset-4 need to be used instead of Devtoolset-6. Task-number: QTBUG-64820 Change-Id: I2601aaaff5f3bbbadd867105fd4155239ab89825 Reviewed-by: Konstantin Tokarev (cherry picked from commit adcdf7b49f52e745009ff7e37e07c2d831ad82dc) Reviewed-by: Tony Sarajärvi --- .../{003-install-devtoolset6.sh => 003-install-devtoolset.sh} | 4 ++-- .../010-openssl_for_android_linux.sh | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) rename coin/provisioning/qtci-linux-RHEL-7.4-x86_64/{003-install-devtoolset6.sh => 003-install-devtoolset.sh} (94%) diff --git a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/003-install-devtoolset6.sh b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/003-install-devtoolset.sh similarity index 94% rename from coin/provisioning/qtci-linux-RHEL-7.4-x86_64/003-install-devtoolset6.sh rename to coin/provisioning/qtci-linux-RHEL-7.4-x86_64/003-install-devtoolset.sh index ef65b881..439e2db5 100755 --- a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/003-install-devtoolset6.sh +++ b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/003-install-devtoolset.sh @@ -34,7 +34,7 @@ ############################################################################# sudo yum-config-manager --enable rhel-server-rhscl7-rpms -sudo yum -y install devtoolset-6 +sudo yum -y install devtoolset-4 -echo "source /opt/rh/devtoolset-6/enable" >> ~/.bashrc +echo "source /opt/rh/devtoolset-4/enable" >> ~/.bashrc diff --git a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/010-openssl_for_android_linux.sh b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/010-openssl_for_android_linux.sh index 05b73729..b69295fc 100755 --- a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/010-openssl_for_android_linux.sh +++ b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/010-openssl_for_android_linux.sh @@ -33,5 +33,5 @@ ## ############################################################################# -source /opt/rh/devtoolset-6/enable +source /opt/rh/devtoolset-4/enable source "${BASH_SOURCE%/*}/../common/openssl_for_android_linux.sh" From 0565e759c593472ffb1b213a2ca549540dfe71b6 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Wed, 13 Dec 2017 10:26:12 +0200 Subject: [PATCH 2/5] Update submodules on '5.9' in qt5 Change-Id: I0a5c2de981acb71511041c19f5ff966b87932367 Reviewed-by: Jani Heikkinen --- qt3d | 2 +- qtactiveqt | 2 +- qtandroidextras | 2 +- qtbase | 2 +- qtcanvas3d | 2 +- qtcharts | 2 +- qtconnectivity | 2 +- qtdatavis3d | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtgamepad | 2 +- qtgraphicaleffects | 2 +- qtimageformats | 2 +- qtlocation | 2 +- qtmacextras | 2 +- qtmultimedia | 2 +- qtnetworkauth | 2 +- qtpurchasing | 2 +- qtquickcontrols | 2 +- qtquickcontrols2 | 2 +- qtremoteobjects | 2 +- qtscript | 2 +- qtscxml | 2 +- qtsensors | 2 +- qtserialbus | 2 +- qtserialport | 2 +- qtspeech | 2 +- qtsvg | 2 +- qttools | 2 +- qttranslations | 2 +- qtvirtualkeyboard | 2 +- qtwayland | 2 +- qtwebchannel | 2 +- qtwebengine | 2 +- qtwebsockets | 2 +- qtwebview | 2 +- qtwinextras | 2 +- qtx11extras | 2 +- qtxmlpatterns | 2 +- 39 files changed, 39 insertions(+), 39 deletions(-) diff --git a/qt3d b/qt3d index 1129ff73..37d78994 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit 1129ff731fca6aff5849cafe1f434f1882342cd7 +Subproject commit 37d78994de56cd11a06ccd1a777cf0ac8ec8e801 diff --git a/qtactiveqt b/qtactiveqt index 2ba06b5c..451ca492 160000 --- a/qtactiveqt +++ b/qtactiveqt @@ -1 +1 @@ -Subproject commit 2ba06b5ce1f5203999039d044009d04a5e8dc484 +Subproject commit 451ca492ea5f71045597f26db54c840addb6d6ae diff --git a/qtandroidextras b/qtandroidextras index 458d2358..cb2fa645 160000 --- a/qtandroidextras +++ b/qtandroidextras @@ -1 +1 @@ -Subproject commit 458d2358e0e67cfcc267bb428a866503b559bd38 +Subproject commit cb2fa645bef1a0c05065fe43a038e5bf962e095b diff --git a/qtbase b/qtbase index d2d6c6f7..782eb1a1 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit d2d6c6f7813fa38ced6b80ead763ed6e6daaa951 +Subproject commit 782eb1a114c0aaa729925899b2061d47f494435f diff --git a/qtcanvas3d b/qtcanvas3d index f4d7923a..25f6b209 160000 --- a/qtcanvas3d +++ b/qtcanvas3d @@ -1 +1 @@ -Subproject commit f4d7923aaaaee0c8fe131040de4dc3cf92fd7195 +Subproject commit 25f6b209a64a3c7e16e1c4655a970aaf5f4341cc diff --git a/qtcharts b/qtcharts index 6cde98b2..ad9d59e8 160000 --- a/qtcharts +++ b/qtcharts @@ -1 +1 @@ -Subproject commit 6cde98b2254e6197a285a83617c952fd1d14cb3d +Subproject commit ad9d59e871b6f1a7b3f0b0ae1248ffa205647993 diff --git a/qtconnectivity b/qtconnectivity index a910c618..e46cde93 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit a910c6185826977d5eabbb15ab2363761d6b75a3 +Subproject commit e46cde935ee76eaa00e78af968121502e2406347 diff --git a/qtdatavis3d b/qtdatavis3d index c3a97327..de346171 160000 --- a/qtdatavis3d +++ b/qtdatavis3d @@ -1 +1 @@ -Subproject commit c3a973273e3c7ac61b8dd9aec282847d30fd4ac1 +Subproject commit de346171018b353d2abcfb589e644480c2aa6fd5 diff --git a/qtdeclarative b/qtdeclarative index 41293196..ae01e0db 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 41293196b4db1aa7a0c616af312875c484639644 +Subproject commit ae01e0dbf50cb6da1967e10eb95d63313dc5aa7a diff --git a/qtdoc b/qtdoc index d21d0d92..b8556f01 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit d21d0d92e799d045a30091a3079d8e8b3cc77c66 +Subproject commit b8556f01d711389d94cc1ccb864324b24c0e7def diff --git a/qtgamepad b/qtgamepad index c1e52bd4..7eaac052 160000 --- a/qtgamepad +++ b/qtgamepad @@ -1 +1 @@ -Subproject commit c1e52bd4a3f1fc996bd6b885b4e98ad5b216cbee +Subproject commit 7eaac052282038dc9a05afe7b48fa4676f6876b5 diff --git a/qtgraphicaleffects b/qtgraphicaleffects index 7d385752..9b6d754d 160000 --- a/qtgraphicaleffects +++ b/qtgraphicaleffects @@ -1 +1 @@ -Subproject commit 7d38575239d10598cb65b9f0ffabca0e018d07a5 +Subproject commit 9b6d754d192ae53306b8fe6277b0bbe84bde53d6 diff --git a/qtimageformats b/qtimageformats index e807afe5..4a5d500d 160000 --- a/qtimageformats +++ b/qtimageformats @@ -1 +1 @@ -Subproject commit e807afe5e218a1db802d2af1ba6c83a7ccf429f0 +Subproject commit 4a5d500d6da8c7af2d3abfcf759586d5756efa77 diff --git a/qtlocation b/qtlocation index 8552cf9d..730b2bd9 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit 8552cf9d96d96dc500743dfbc117f0634cab0590 +Subproject commit 730b2bd96e88fe63364c9f81e299555f0b1f0daa diff --git a/qtmacextras b/qtmacextras index 508db880..26ce599c 160000 --- a/qtmacextras +++ b/qtmacextras @@ -1 +1 @@ -Subproject commit 508db880f0e3506679c65ee24ff0935351daa484 +Subproject commit 26ce599c8ffdae9b001ec9dc7d5639ff0b528066 diff --git a/qtmultimedia b/qtmultimedia index c60d87c3..10998733 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit c60d87c314d467997701729104ce02c9ed5c6501 +Subproject commit 10998733af8a3d54b795ee57a8df9a1b3e776aae diff --git a/qtnetworkauth b/qtnetworkauth index da3963e3..eee494c1 160000 --- a/qtnetworkauth +++ b/qtnetworkauth @@ -1 +1 @@ -Subproject commit da3963e3d406b445223081cbdfe10858ba2036ae +Subproject commit eee494c12a70fa0aa6fce427f47f44ff60281dca diff --git a/qtpurchasing b/qtpurchasing index d5b1a88c..acdce943 160000 --- a/qtpurchasing +++ b/qtpurchasing @@ -1 +1 @@ -Subproject commit d5b1a88c7a51bb4a192c20dd494dac580e238110 +Subproject commit acdce9431b5ead5754e149853839569ffbd9e200 diff --git a/qtquickcontrols b/qtquickcontrols index 00bfab66..37592ad9 160000 --- a/qtquickcontrols +++ b/qtquickcontrols @@ -1 +1 @@ -Subproject commit 00bfab6671fda57cc34aa84335a6c47ffb0df98e +Subproject commit 37592ad9c6df35bdd37609569963fe7361cdad85 diff --git a/qtquickcontrols2 b/qtquickcontrols2 index bd617ed6..d9e740d2 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit bd617ed62ba35ee11da75b7e92db3fd190751b0f +Subproject commit d9e740d2ccf8c1d3caacfcd95537718048e3a7ba diff --git a/qtremoteobjects b/qtremoteobjects index c10eaf91..170aa77f 160000 --- a/qtremoteobjects +++ b/qtremoteobjects @@ -1 +1 @@ -Subproject commit c10eaf9148ec111c3fb752cc15e854e5c7fd3ea7 +Subproject commit 170aa77ff7a38ba2ddbc68f75c1ac38a47af87ea diff --git a/qtscript b/qtscript index c5b7db2e..c904f06f 160000 --- a/qtscript +++ b/qtscript @@ -1 +1 @@ -Subproject commit c5b7db2e5cbc4477da75691602af1cc5fad10af0 +Subproject commit c904f06f716585edd94dbd1b4271dcbf305c268a diff --git a/qtscxml b/qtscxml index 3aa7c73a..866816d5 160000 --- a/qtscxml +++ b/qtscxml @@ -1 +1 @@ -Subproject commit 3aa7c73a97af0d44666fc70570853182612c0c9a +Subproject commit 866816d57204dc60bb9d0a8b5157c4cf7addd214 diff --git a/qtsensors b/qtsensors index 90e56c11..e2a5bf08 160000 --- a/qtsensors +++ b/qtsensors @@ -1 +1 @@ -Subproject commit 90e56c11caa0251ed3f6f5620869512e1a8e6cf1 +Subproject commit e2a5bf08c4d9239ff1da88b4d35e9bb89133a940 diff --git a/qtserialbus b/qtserialbus index 0ace2c05..50aea4ad 160000 --- a/qtserialbus +++ b/qtserialbus @@ -1 +1 @@ -Subproject commit 0ace2c053464ac08cc93a8319e38df50e1c3acbf +Subproject commit 50aea4ada4521f009ea8524b91daea1fac283c41 diff --git a/qtserialport b/qtserialport index 8fd986ec..5fdcd2f6 160000 --- a/qtserialport +++ b/qtserialport @@ -1 +1 @@ -Subproject commit 8fd986ec9aec0503985fbd0704f0671d58a1e3a5 +Subproject commit 5fdcd2f60021771d301743f51852db05ea45cdf2 diff --git a/qtspeech b/qtspeech index 8278f9f5..53afd080 160000 --- a/qtspeech +++ b/qtspeech @@ -1 +1 @@ -Subproject commit 8278f9f5d2c9f47233f59ff8af757e0591045895 +Subproject commit 53afd0808aeae53bf1ad94647be936cce00ef9a1 diff --git a/qtsvg b/qtsvg index 18a2adad..808ae358 160000 --- a/qtsvg +++ b/qtsvg @@ -1 +1 @@ -Subproject commit 18a2adad907523ea31251ff0b62e3321241a40fa +Subproject commit 808ae3589a031413e25d7b6e66f2e966cefacb96 diff --git a/qttools b/qttools index f8bb798a..796a5e00 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit f8bb798ade81f152bc8ff2028e4974150171fa08 +Subproject commit 796a5e005fa1ae2bfe6f9278fc482723eb89f429 diff --git a/qttranslations b/qttranslations index 069f791e..6987cf96 160000 --- a/qttranslations +++ b/qttranslations @@ -1 +1 @@ -Subproject commit 069f791e56e2421c0e29c0358732aba4e275ad4c +Subproject commit 6987cf9681dfb6c212a3225a8669499d3dfe1871 diff --git a/qtvirtualkeyboard b/qtvirtualkeyboard index 78873735..6ecb881b 160000 --- a/qtvirtualkeyboard +++ b/qtvirtualkeyboard @@ -1 +1 @@ -Subproject commit 78873735b041f6eeb4bbd22d3284457ce40e9d06 +Subproject commit 6ecb881bdc73a4ab1f4485e14bb87c18aac771ca diff --git a/qtwayland b/qtwayland index e74ff73d..6bd70687 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit e74ff73d2b2acef0b97530a2c7dd52e20ada6239 +Subproject commit 6bd70687aa32d1ad6fedc7cfad499fdaf037193e diff --git a/qtwebchannel b/qtwebchannel index 9196ca1b..44a2c000 160000 --- a/qtwebchannel +++ b/qtwebchannel @@ -1 +1 @@ -Subproject commit 9196ca1b09ba5cc6b6910c775906fcff4c4d6eac +Subproject commit 44a2c0006546ba39a4a523904f75a9cb01cfe5fc diff --git a/qtwebengine b/qtwebengine index 9f798b78..260e9dd9 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 9f798b787a2542688c30503d3f62fe2d7c4d5a72 +Subproject commit 260e9dd9b98c2bc90229f7d2f7aba8cc0029d24d diff --git a/qtwebsockets b/qtwebsockets index 1b9a3c75..bd08a6ba 160000 --- a/qtwebsockets +++ b/qtwebsockets @@ -1 +1 @@ -Subproject commit 1b9a3c75259ceaa5e475b47e396a548c475df401 +Subproject commit bd08a6ba75ed04089fb2fa3e763ade8ebc1ef9da diff --git a/qtwebview b/qtwebview index 68423dce..17e076b5 160000 --- a/qtwebview +++ b/qtwebview @@ -1 +1 @@ -Subproject commit 68423dce756f1df7f282b8cdbe0c7fead91d1ff2 +Subproject commit 17e076b56e40e25248f156830b293fee6421ecfc diff --git a/qtwinextras b/qtwinextras index 494bde3b..13042633 160000 --- a/qtwinextras +++ b/qtwinextras @@ -1 +1 @@ -Subproject commit 494bde3bd59465b1c953fb4449db1ae45b714e16 +Subproject commit 130426337da1703ed3c0d9d84f4ccbd96c561336 diff --git a/qtx11extras b/qtx11extras index d1a3ecdc..aee4dc63 160000 --- a/qtx11extras +++ b/qtx11extras @@ -1 +1 @@ -Subproject commit d1a3ecdc4dc385f6f24791bf2e9ba8dc5041216f +Subproject commit aee4dc63f6d43cf775c063b76d789ac6d4a8f517 diff --git a/qtxmlpatterns b/qtxmlpatterns index 431a23f2..f5f2b1f5 160000 --- a/qtxmlpatterns +++ b/qtxmlpatterns @@ -1 +1 @@ -Subproject commit 431a23f274f6bae1dc9e8cdd13b4ac993f5a0991 +Subproject commit f5f2b1f5fc29968b13b464cc9a6b2df6eebe75c7 From 1dee4e9fcaba0cce26a1054530b3ab5958cf2434 Mon Sep 17 00:00:00 2001 From: Joni Jantti Date: Thu, 7 Dec 2017 12:52:19 +0200 Subject: [PATCH 3/5] Fix broken and duplicate Ruby provisioning MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Ruby is being installed twice on certain Windows platforms and the 32 bit versions of these don't have a working PATH addition. Task-number: QTQAINFRA-1632 Change-Id: Id7fd269854d17c32df7d0b82ac9e750e645af564 Reviewed-by: Tony Sarajärvi --- coin/provisioning/common/install-ruby.ps1 | 14 ++++++-------- coin/provisioning/common/ruby.ps1 | 7 ------- .../qtci-windows-10-x86/09-install-ruby.ps1 | 1 + coin/provisioning/qtci-windows-10-x86/ruby.ps1 | 1 - coin/provisioning/qtci-windows-10-x86_64/ruby.ps1 | 1 - coin/provisioning/qtci-windows-7-x86/33-ruby.ps1 | 1 - coin/provisioning/qtci-windows-7-x86/ruby.ps1 | 1 - .../provisioning/qtci-windows-7-x86_64/26-ruby.ps1 | 1 - 8 files changed, 7 insertions(+), 20 deletions(-) delete mode 100644 coin/provisioning/common/ruby.ps1 create mode 100644 coin/provisioning/qtci-windows-10-x86/09-install-ruby.ps1 delete mode 100644 coin/provisioning/qtci-windows-10-x86/ruby.ps1 delete mode 100644 coin/provisioning/qtci-windows-10-x86_64/ruby.ps1 delete mode 100644 coin/provisioning/qtci-windows-7-x86/33-ruby.ps1 delete mode 100644 coin/provisioning/qtci-windows-7-x86/ruby.ps1 delete mode 100644 coin/provisioning/qtci-windows-7-x86_64/26-ruby.ps1 diff --git a/coin/provisioning/common/install-ruby.ps1 b/coin/provisioning/common/install-ruby.ps1 index 57cf227f..94e32b74 100644 --- a/coin/provisioning/common/install-ruby.ps1 +++ b/coin/provisioning/common/install-ruby.ps1 @@ -35,26 +35,24 @@ # This script will install Ruby -$version = "2.2.6" +$version = "2.4.2-2" if( (is64bitWinHost) -eq 1 ) { $arch = "-x64" - $sha1 = "4D0E366F0264CDED174E5842B2435E22B81FB57A" + $sha1 = "c961c2752a183487bc42ed24beb7e931230fa7d5" } else { - $arch = "" - $sha1 = "8649309fffe9c746ad5549d3f7b70490806e95df" + $arch = "-x86" + $sha1 = "2639a481c3b5ad11f57d5523cc41ca884286089e" } $url_cache = "\\ci-files01-hki.intra.qt.io\provisioning\windows\rubyinstaller-" + $version + $arch + ".exe" -$url_official = "https://bintray.com/oneclick/rubyinstaller/download_file?file_path=rubyinstaller-" + $version + $arch + ".exe" +$url_official = "https://github.com/oneclick/rubyinstaller2/releases/download/rubyinstaller-" + $version + "/rubyinstaller-" + $version + $arch + ".exe" $rubyPackage = "C:\Windows\Temp\rubyinstaller-$version.exe" Download $url_official $url_cache $rubyPackage Verify-Checksum $rubyPackage $sha1 -cmd /c "$rubyPackage /silent" +Start-Process -FilePath $rubyPackage -ArgumentList "/dir=C:\Ruby-$version$arch /tasks=modpath /verysilent" -Wait echo "Cleaning $rubyPackage.." Remove-Item -Recurse -Force "$rubyPackage" -Add-Path "C:\Ruby22-x64\bin" - echo "Ruby = $version" >> ~\versions.txt diff --git a/coin/provisioning/common/ruby.ps1 b/coin/provisioning/common/ruby.ps1 deleted file mode 100644 index f7813c20..00000000 --- a/coin/provisioning/common/ruby.ps1 +++ /dev/null @@ -1,7 +0,0 @@ -. "$PSScriptRoot\helpers.ps1" - -$installer = "c:\users\qt\downloads\rubyinstaller-2.3.1.exe" - -Download https://dl.bintray.com/oneclick/rubyinstaller/rubyinstaller-2.3.1.exe http://ci-files01-hki.intra.qt.io/input/ruby/rubyinstaller-2.3.1.exe $installer -Verify-Checksum $installer "FF377F6F313849C3B0CD72EEC1EFFA436F0E4A36" -& $installer /DIR=C:\ruby /VERYSILENT diff --git a/coin/provisioning/qtci-windows-10-x86/09-install-ruby.ps1 b/coin/provisioning/qtci-windows-10-x86/09-install-ruby.ps1 new file mode 100644 index 00000000..0d28ea1e --- /dev/null +++ b/coin/provisioning/qtci-windows-10-x86/09-install-ruby.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\install-ruby.ps1" diff --git a/coin/provisioning/qtci-windows-10-x86/ruby.ps1 b/coin/provisioning/qtci-windows-10-x86/ruby.ps1 deleted file mode 100644 index 587a4c10..00000000 --- a/coin/provisioning/qtci-windows-10-x86/ruby.ps1 +++ /dev/null @@ -1 +0,0 @@ -. "$PSScriptRoot\..\common\ruby.ps1" diff --git a/coin/provisioning/qtci-windows-10-x86_64/ruby.ps1 b/coin/provisioning/qtci-windows-10-x86_64/ruby.ps1 deleted file mode 100644 index 587a4c10..00000000 --- a/coin/provisioning/qtci-windows-10-x86_64/ruby.ps1 +++ /dev/null @@ -1 +0,0 @@ -. "$PSScriptRoot\..\common\ruby.ps1" diff --git a/coin/provisioning/qtci-windows-7-x86/33-ruby.ps1 b/coin/provisioning/qtci-windows-7-x86/33-ruby.ps1 deleted file mode 100644 index 587a4c10..00000000 --- a/coin/provisioning/qtci-windows-7-x86/33-ruby.ps1 +++ /dev/null @@ -1 +0,0 @@ -. "$PSScriptRoot\..\common\ruby.ps1" diff --git a/coin/provisioning/qtci-windows-7-x86/ruby.ps1 b/coin/provisioning/qtci-windows-7-x86/ruby.ps1 deleted file mode 100644 index 587a4c10..00000000 --- a/coin/provisioning/qtci-windows-7-x86/ruby.ps1 +++ /dev/null @@ -1 +0,0 @@ -. "$PSScriptRoot\..\common\ruby.ps1" diff --git a/coin/provisioning/qtci-windows-7-x86_64/26-ruby.ps1 b/coin/provisioning/qtci-windows-7-x86_64/26-ruby.ps1 deleted file mode 100644 index 587a4c10..00000000 --- a/coin/provisioning/qtci-windows-7-x86_64/26-ruby.ps1 +++ /dev/null @@ -1 +0,0 @@ -. "$PSScriptRoot\..\common\ruby.ps1" From b0b6b05b34f7d24c3a762e9b383c1b5bd1153a04 Mon Sep 17 00:00:00 2001 From: Jani Heikkinen Date: Mon, 11 Dec 2017 12:06:05 +0200 Subject: [PATCH 4/5] Add 'ForceDebugInfo' -flag to linux desktop binaries Add 'ForceDebugInfo' for RHEL 7.4 as well Task-number: QTBUG-3934 Change-Id: I121c109f755c1b65bc0a59fc4edcb0a03f870d54 Reviewed-by: Akseli Salovaara --- coin/platform_configs/default.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/coin/platform_configs/default.txt b/coin/platform_configs/default.txt index 39f0373d..4f6920c9 100644 --- a/coin/platform_configs/default.txt +++ b/coin/platform_configs/default.txt @@ -12,7 +12,7 @@ qtci-linux-Ubuntu-16.04-x86_64-1 GCC qtci-linux-openSUSE-42.3-x86_64 GCC DeveloperBuild NoPch qtci-linux-openSUSE-42.3-x86_64 ICC_18 DeveloperBuild NoPch DisableTests qtci-linux-RHEL-6.6-x86_64 GCC Release ForceDebugInfo -qtci-linux-RHEL-7.4-x86_64 GCC Packaging Release NoUseGoldLinker +qtci-linux-RHEL-7.4-x86_64 GCC Packaging Release NoUseGoldLinker ForceDebugInfo qtci-macos-10.12-x86_64-8 Clang Packaging DebugAndRelease Release qtci-osx-10.11-x86_64-3 Clang DeveloperBuild Release QtNamespace NoPch qtci-osx-10.10-x86_64 Clang Release NoFramework DisableTests From b16eac13e6f65f338ec9e78ce4a926edadde8efb Mon Sep 17 00:00:00 2001 From: Heikki Halmet Date: Wed, 13 Dec 2017 13:22:26 +0200 Subject: [PATCH 5/5] Provisioning: Remove Android script from Red Hat 6.6 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Android linux builds are run by Red Hat 7.4 Change-Id: I8661b90494c1d43cc87e50136ed185fac93e4916 Reviewed-by: Tony Sarajärvi --- .../android_linux.sh | 120 ------------------ 1 file changed, 120 deletions(-) delete mode 100644 coin/provisioning/qtci-linux-RHEL-6.6-x86_64/android_linux.sh diff --git a/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/android_linux.sh b/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/android_linux.sh deleted file mode 100644 index 69b3c10e..00000000 --- a/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/android_linux.sh +++ /dev/null @@ -1,120 +0,0 @@ -#!/bin/env bash - -############################################################################# -## -## Copyright (C) 2016 The Qt Company Ltd. -## Contact: http://www.qt.io/licensing/ -## -## This file is part of the test suite of the Qt Toolkit. -## -## $QT_BEGIN_LICENSE:LGPL21$ -## Commercial License Usage -## Licensees holding valid commercial Qt licenses may use this file in -## accordance with the commercial license agreement provided with the -## Software or, alternatively, in accordance with the terms contained in -## a written agreement between you and The Qt Company. For licensing terms -## and conditions see http://www.qt.io/terms-conditions. For further -## information use the contact form at http://www.qt.io/contact-us. -## -## GNU Lesser General Public License Usage -## Alternatively, this file may be used under the terms of the GNU Lesser -## General Public License version 2.1 or version 3 as published by the Free -## Software Foundation and appearing in the file LICENSE.LGPLv21 and -## LICENSE.LGPLv3 included in the packaging of this file. Please review the -## following information to ensure the GNU Lesser General Public License -## requirements will be met: https://www.gnu.org/licenses/lgpl.html and -## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -## -## As a special exception, The Qt Company gives you certain additional -## rights. These rights are described in The Qt Company LGPL Exception -## version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -## -## $QT_END_LICENSE$ -## -############################################################################# - -# This script install Android sdk and ndk. - -# It also runs update for SDK API level 21, latest SDK tools, latest platform-tools and build-tools version 23.0.3 - -# Build-tools version 23.0.3 is the latest usable version for Red Hat 6. Newer version of build-tools, version 24.x.x, requires GLIBC_2.14, which is not available in Red Hat 6. - -# Android 16 is the minimum requirement for Qt 5.7 applications, but we need something more recent than that for building Qt itself. -# E.g The Bluetooth features that require Android 21 will disable themselves dynamically when running on an Android 16 device. -# That's why we need to use Andoid-21 API version in Qt 5.9. - -set -ex -targetFolder="/opt/android" -baseUrl="http://ci-files01-hki.intra.qt.io/input/android" - -# SDK -sdkPackage="android-sdk_r24.4.1-linux.tgz" -sdkBuildToolsVersion="23.0.3" -sdkApiLevel="android-21" -sdkUrl="$baseUrl/$sdkPackage" -sdkSha1="725bb360f0f7d04eaccff5a2d57abdd49061326d" -sdkTargetFile="$targetFolder/$sdkPackage" -sdkExtract="tar -C $targetFolder -zxf $sdkTargetFile" -sdkFolderName="android-sdk-linux" -sdkName="sdk" - -# NDK -ndkVersion="r10e" -ndkPackage="android-ndk-$ndkVersion-linux-x86_64.zip" -ndkUrl="$baseUrl/$ndkPackage" -ndkSha1="f692681b007071103277f6edc6f91cb5c5494a32" -ndkTargetFile="$targetFolder/$ndkPackage" -ndkExtract="unzip $ndkTargetFile -d $targetFolder" -ndkFolderName="android-ndk-$ndkVersion" -ndkName="ndk" - -function InstallAndroidPackage { - targetFolder=$1 - version=$2 - url=$3 - sha1=$4 - targetFile=$5 - extract=$6 - folderName=$7 - name=$8 - - sudo wget --tries=5 --waitretry=5 --output-document="$targetFile" "$url" - echo "$sha1 $targetFile" | sha1sum --check - sudo chmod 755 "$targetFile" - sudo $extract || echo "Failed to extract $url" - sudo chown -R qt:users "$targetFolder"/"$folderName" - sudo mv "$targetFolder"/"$folderName" "$targetFolder"/"$name" || echo "Failed to rename $name" - sudo rm -fr "$targetFolder"/"$version" -} - -if [ -d "$targetFolder" ]; then - echo "Removing old Android installation" - sudo rm -fr "$targetFolder" -fi - -sudo mkdir "$targetFolder" - -# Install Android SDK -echo "Installing Android SDK version $sdkPackage..." -InstallAndroidPackage "$targetFolder" $sdkPackage $sdkUrl $sdkSha1 $sdkTargetFile "$sdkExtract" $sdkFolderName $sdkName - -# Install Android NDK -echo "Installing Android NDK version $ndkPackage..." -InstallAndroidPackage "$targetFolder" $ndkPackage $ndkUrl $ndkSha1 $ndkTargetFile "$ndkExtract" $ndkFolderName $ndkName - -# run update for Android SDK and install SDK API version 21, latest SDK tools, platform-tools and build-tools -echo "Running Android SDK update for API version 21, SDK-tools, platform-tools and build-tools-$sdkBuildToolsVersion..." -echo "y" |"$targetFolder"/sdk/tools/android update sdk --no-ui --all --filter $sdkApiLevel,tools,platform-tools,build-tools-$sdkBuildToolsVersion - -echo 'export ANDROID_API_VERSION=android-21' >> ~/.bashrc - -# Storage version information to ~/versions.txt, which is used to print version information to provision log. -echo "***** Android SDK *****" >> ~/versions.txt -echo "Android SDK Api Level = $sdkApiLevel" >> ~/versions.txt -echo "Android SDK Build Tools Version = $sdkBuildToolsVersion" >> ~/versions.txt -platformTools="$(grep Pkg.Revision "$targetFolder"/sdk/platform-tools/source.properties | cut -c14-)" -echo "Android Platform Tools = $platformTools" >> ~/versions.txt -sdkTools="$(grep Pkg.Revision "$targetFolder"/sdk/tools/source.properties | cut -c14-)" -echo "Android SDK Tools = $sdkTools" >> ~/versions.txt -echo "***** Android NDK *****" >> ~/versions.txt -echo "Android NDK Version = $ndkVersion" >> ~/versions.txt