summaryrefslogtreecommitdiffstats
path: root/coin/provisioning/common
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/wip/cmake' into devSimon Hausmann2019-12-138-25/+171
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This merges merely the provisioning changes needed to perform cmake builds in the CI. The platform configuration changes will be applied incremental as we merge support in the individual modules. Conflicts: coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/02-apt.sh Added ninja to coin/provisioning/qtci-linux-SLES-15-x86_64/02-zypperpackages.sh just to force re-provisioning. Removed module_config.yaml because that breaks license check in qmake builds. Change-Id: Ic074c0c881404f4361e61f66130c0cb07f5e8b84
| * Update vcpkg snapshotAlexandru Croitor2019-12-111-1/+1
| | | | | | | | | | | | | | | | | | | | The snapshot uses the previous snapshot as a based. It was rebased on latest master as of 2019-12-05, and also contains cherry-picked patches to target iOS. Change-Id: I9fc0c39856fdb255533f6c71d27f5749894b6bea Reviewed-by: Qt CMake Build Bot Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| * Update CMake to version 3.16.0-rc4Liang Qi2019-11-293-12/+14
| | | | | | | | | | | | Change-Id: I4fc1f412888e1915ae2110320c18fb39a9600b94 Reviewed-by: Qt CMake Build Bot Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
| * Merge remote-tracking branch 'origin/dev' into wip/cmakeLiang Qi2019-11-2810-160/+45
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also update the Windows config to use MSVC2019 instead of 2017 to circumvent the issue that vcpkg is building libraries with the latest compiler it finds (MSVC 2019), but Qt is building with 2017. Conflicts: coin/platform_configs/default.yaml coin/platform_configs/qt5.yaml coin/platform_configs/qtsaferenderer.yaml Change-Id: I88deb114e171046b50fc617ab6bc18b707d61486
| * | Bump vcpkg to a new snapshotSimon Hausmann2019-11-133-6/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some patches were upstreamed and this beings the version in line with what we need for Android. This patch also centralizes the version into a shared file, for future use. Change-Id: I90973f9bfcbc1bfeb2d11e2ee7a7fa4e4f6a58a2 Reviewed-by: Qt CMake Build Bot Reviewed-by: Liang Qi <liang.qi@qt.io>
| * | Update CMake to version 3.15.5Leander Beernaert2019-11-123-9/+9
| | | | | | | | | | | | | | | | | | | | | | | | Update required as there's a bug with setting the CXX_STANDARD on android. Updating to this version fixes the issue. Change-Id: I50b0bc2941e0919232b46bbf5b28133149878649 Reviewed-by: Liang Qi <liang.qi@qt.io>
| * | Merge remote-tracking branch 'origin/dev' into wip/cmakeSimon Hausmann2019-11-1145-136/+1175
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: coin/platform_configs/default.yaml coin/platform_configs/qt5.yaml coin/platform_configs/qtbase.yaml coin/platform_configs/qtdeclarative.yaml coin/platform_configs/qtsaferenderer.yaml coin/platform_configs/qtsdk.yaml coin/provisioning/common/linux/cmake_linux.sh coin/provisioning/common/windows/cmake.ps1 Change-Id: I37bb513e3be19e4de4003679f8528677e57c09ee
| * | | platform_configs: add Android arm64 build on RHEL 7.6 hostLiang Qi2019-10-111-0/+72
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * install vcpkg and for android * a remaining issue in vcpkg: https://github.com/microsoft/vcpkg/issues/8506 Task-number: QTBUG-78945 Change-Id: I484612e2157bf1c1142934cc4f27729e8be37b89 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io> Reviewed-by: Qt CMake Build Bot
| * | | provisioning: update python to 3.7 on macosLiang Qi2019-10-111-10/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTQAINFRA-3271 Change-Id: Ic1645a8b5bc94b0ce6ff58352891af0beabd7649 Reviewed-by: Qt CMake Build Bot Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io> Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
| * | | platform_configs: add a RHEL 7.6 buildLiang Qi2019-10-101-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A preparing for having android build later. * install gcc 7.x * install git 2.x * install a few other dependencies Change-Id: I18f05bdfb78c92b7f05f67609613b5271b400f91 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io> Reviewed-by: Qt CMake Build Bot
| * | | Merge remote-tracking branch 'origin/dev' into wip/cmakeLiang Qi2019-09-2379-2037/+3571
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: .gitmodules coin/platform_configs/default.txt Change-Id: I78eb6b6522c678fb40f1202c0040c1c87ff890a6
| * | | | Update vcpkg installationSimon Hausmann2019-06-211-20/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use the latest snapshot, fetch the package set from the repo itself and set the VCPKG_ROOT environment variable as that's the vcpkg documented interface. The qt specific triplet defaults to static linkage, which allows removing the %PATH% handling and resembles the same setup as in Qt 5 where we linked the 3rd-party code statically into qt. Change-Id: I789d61b5c7258674c2dd80403efaeb891c8f75c7 Reviewed-by: Liang Qi <liang.qi@qt.io>
| * | | | Update cmake sha1 for WindowsJędrzej Nowacki2019-06-061-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It amends a6d159c9e714a6b743ae13b96e2ebcd241c50a01. Seems that I computed sha1 for a wrong file. Change-Id: Ie524b2c825189a91cd6b809ff7991af20bd301b1 Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@qt.io>
| * | | | Bump cmake to 3.15-rc1 on WindowsJędrzej Nowacki2019-06-061-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Same as for the recent Linux and macOS change. Change-Id: Ic7ae30333f8cd58925f697c19ca046ceac49cd32 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| * | | | Fix provisioning of cmake on macOSJędrzej Nowacki2019-06-061-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The script contains a bit of data duplication, one of the fields was not updated. This amends 463235a0bcdf42ece5be2d0b27dfb81cb46d5dfb. Change-Id: Idb9e88eba1f1415a0ca29f2c3a003c8a844bb024 Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@qt.io>
| * | | | Bump cmake to 3.15-rc1Simon Hausmann2019-06-051-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Same as for the recent Linux change. Change-Id: I073411bcfa8cbd692a7770cdaad3a368c6f7108d Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@qt.io>
| * | | | Install cmake from binaries instead of from sourceSimon Hausmann2019-06-051-72/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The from-source installation originates from a point in time where there was no cmake release with binaries that were sufficient. That is not the case with 3.15-rc1. Change-Id: I385016969f21c194b25334e3af8af7283fc5873f Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@qt.io>
| * | | | Upgrade CMake to 3.15.0-rc1Jean-Michaël Celerier2019-06-051-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I374631637a6521621dfa702aa2390998ef124d24 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| * | | | Provisioning: install vcpkg and some packages on Windows 10Liang Qi2019-05-031-0/+65
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ib8ba5b30ebcfb5e66ce5de65c9287807943d7166 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
| * | | | Provisioning: install latest cmake - 3.14.1 on WindowsLiang Qi2019-05-031-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I461589be02c26e048d5975d59600376022d728fd Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
| * | | | Provisioning: build cmake from source on macOS 10.13Liang Qi2019-05-031-5/+7
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ifada0cf62d1e75e8cab3e3bbe6250718747d0703 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
| * | | | Merge remote-tracking branch 'origin/dev' into wip/cmakeLiang Qi2019-05-0323-267/+331
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: .gitmodules coin/platform_configs/default.txt coin/platform_configs/qt5.txt coin/platform_configs/qtbase.txt Change-Id: Ib25154566eb6da77f091d8f112cc1248cac9eb16
| * | | | | Provisioning: build cmake from sourceLiang Qi2019-03-151-0/+70
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I6b4006250a7e019d7c38eaf3c29ae75a3a65300c Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io> Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| * | | | | Cmake: install latest 3.14.0-rc3 packages on LinuxLiang Qi2019-03-131-5/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I5d88ac6c9180c24538de7c386d026f2d6547ccf4 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* | | | | | Tag the docker images as "latest"Dimitrios Apostolou2019-12-051-6/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We will use this tag in qtbase to refer to the image to run, because with the current sha1tree() tag, every minor change in the docker images requires synchronized changes between repositories. Task-number: QTBUG-79867 Change-Id: If94eb6dd8b97526b589e58064837bc6554fed79c Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
* | | | | | Provisioning: Remove sudo when installing pip packages for Qt userSimo Fält2019-11-251-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There is no need to install as sudo for qt user. Using sudo will change the cache dir's permissions preventing us from installing anything with pip as normal user. Change-Id: Id45bf3805ce4d772a6c82e429d4e1948289f076e Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* | | | | | Provisioning: update SquishJohanna Äijälä2019-11-212-11/+7
| |_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update with custom build of Squish to be able to launch Qt5.14 applications in RTA tests. Change-Id: Ic420656852ae885b057de937baabf01135526764 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* | | | | Provisioning: Change JDK script to use 'Remove' function from helpersHeikki Halmet2019-11-201-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTQAINFRA-3369 Change-Id: I2e873eb50d9129c48d92370af80fe121039d172e Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
* | | | | Provisioning: Remove shell scripts under windowsHeikki Halmet2019-11-202-45/+0
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I3d7a949e95bab39adc349c25d267b7fc28e676cf Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
* | | | | Provisioning: Install python modules needed by packagingHeikki Halmet2019-11-201-0/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Needed by packaging scripts Task-number: COIN-214 Change-Id: I3ac719800c3afd183996379f6c23fbe3f8bcf7cb Reviewed-by: Iikka Eklund <iikka.eklund@qt.io>
* | | | | Merge remote-tracking branch 'origin/5.13' into 5.14Liang Qi2019-11-183-13/+39
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: coin/provisioning/common/linux/docker.sh Change-Id: Ic5c3fcaa856137de46c6f3830ca75cedb084927d
| * | | | | Keep debug trace off to avoid polluting the logsDimitrios Apostolou2019-11-141-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I8a2d878a52b5e0a818d7f80fff495feca84d0e9c Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
| * | | | | Docker installation: do not depend on external repositoriesDimitrios Apostolou2019-11-141-9/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also updated the docker-compose binary to the latest one. Task-number: QTQAINFRA-3279 Change-Id: Ie09a772ca8247aa5f5bd6d36774b68b6bb846386 Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
| * | | | | Fix cache URL for telegraf windows packageDimitrios Apostolou2019-11-141-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes: QTQAINFRA-3340 Change-Id: Ie7bad3666094e3f8f8e8971c2bfe05457ca6cd45 Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
| * | | | | DownloadURL last argument (targetFile) is now optionalDimitrios Apostolou2019-11-141-1/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I0864bcb052cddcc9753c056758b6e65fd561d928 Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
* | | | | | Provisioning: Add MSVC 2019 and upgrade MSVC 2017 to the latest versionHeikki Halmet2019-11-074-133/+0
| |_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Under coin/pre-provisioning can be found information what have been provisioned to tier1 image Visual studios are updated to versions: MSVC 2019: version 16.3.1 MSVC 2017: version 15.9.16 Task-number: QTQAINFRA-2875 Change-Id: I3a9748296dcf088bb312dec8f78bdc59dfb281d1 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* | | | | Merge remote-tracking branch 'origin/5.13' into 5.14Liang Qi2019-11-0615-110/+87
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: coin/provisioning/qtci-macos-10.12-x86_64/05-systemsetup.sh Change-Id: Ie9eae2144868cbe4a6c5ff9472c1a0e8fd53ed08
| * | | | Provisioning: Upgrade OpenSSL version to 1.1.1dHeikki Halmet2019-11-025-87/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Plus removing unused file install_openssl_111a.sh Task-number: QTQAINFRA-3224 Change-Id: If5f9ee12e118e0329eb27f8d3ca9829011874382 Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
| * | | | Remove more of update notifiersTony Sarajärvi2019-11-011-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I507f584ef82b5f41f6b1cbc22fdd4ff6eff5e911 Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
| * | | | Add allowUntrusted parameter for command line tools and refresh XcodeHeikki Halmet2019-10-291-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Apple has signed their packages with certificate which has been expired 24.11.2019. Packages are unusable without allowUntrusted parameter Also Xcode package for macOS10.13 needs to be refetched from Apple's download to local cache Task-number: QTQAINFRA-3317 Change-Id: Iebbe81ee0c360e5f0b49d422b38fe1a148424891 Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
| * | | | Provision gnuwin32's pathTony Sarajärvi2019-10-261-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | By provisioning the path to gnuwin32, we can remove the hard coded paths from Coin. Task-number: QTBUG-73422 Change-Id: Ice96fcd992e22ed39b66496403b9eaa99a6865a0 Reviewed-by: Toni Saario <toni.saario@qt.io> Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
| * | | | Provisioning: Disable automatic cleanup from windowsHeikki Halmet2019-10-181-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTQAINFRA-3238 Change-Id: Ie64086b650016adb7129bd4c4592ca987cc1453b Reviewed-by: Daniel Smith <Daniel.Smith@qt.io> Reviewed-by: Dimitrios Apostolou <jimis@qt.io> Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
| * | | | Fix for DownloadURL to try alternative URLDimitrios Apostolou2019-10-151-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I7e9a77815ef8f4c258dda44bda6fdd4eb3736ef4 Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
| * | | | Provisioning: Update Cmake to version 3.7.2Heikki Halmet2019-10-152-8/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QtCreator requires Cmake minimal version to be at least 3.7.0 Task-number: QTQAINFRA-3272 Change-Id: Id7f2d38ad0581c1aead4b5bac860ac193488ae1b Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io> Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
| * | | | Provisioning: Hide windows squish installation output from the logHeikki Halmet2019-10-091-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This will prevent the output of unwanted information Change-Id: I5f1824a6bbe98c673ef04dc2daa0db0536d27828 Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
| * | | | Provisioning: Make sure that Configure and Make will passHeikki Halmet2019-10-091-3/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | During powershell process error is not caught and provisioning continues even if the exitcode is something else that '0' Task-number: QTQAINFRA-3214 Change-Id: I91116a78d0c4defe6ba4287913c2394e199be958 Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io> Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
| * | | | Ensure provisioning works even without the secretsDimitrios Apostolou2019-10-081-3/+10
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I3869e881341a719da8a351095c3bf314c2fa2f34 Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
| * | | | Fix shell function is_script_executedDimitrios Apostolou2019-10-081-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It used to return error when tested inside a login shell, because $0 is "-bash" and `basename` was trying to interpret -b as an option. Change-Id: I5faa2dc01e50c7d5bcfc0ab1fcfd910b2538afc2 Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
| * | | | Fix provisioning script for RHEL 6Dimitrios Apostolou2019-10-081-2/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It seems RHEL 6.6 does not provide /etc/os-release. Change-Id: I01ba2bb17b89c01f9991944a11eeaa9c2eba6f20 Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
* | | | | Merge remote-tracking branch 'origin/5.13' into 5.14Liang Qi2019-10-0133-39/+1076
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: coin/platform_configs/default.yaml coin/platform_configs/qt5.yaml Change-Id: I48b1e814dd6328dfb2827d0898a277b81ec25e55