aboutsummaryrefslogtreecommitdiffstats
path: root/coin/provisioning
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/wip/cmake' into devSimon Hausmann2019-12-1321-31/+216
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-2826-175/+106
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-11147-823/+1881
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-112-0/+77
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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-104-4/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | Provisioning: install libsdl2 on ubuntuLiang Qi2019-10-031-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I3c547c1e44ebc734fd9908db2828440bc13f55f5 Reviewed-by: Qt CMake Build Bot Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io> Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
| * | | Merge remote-tracking branch 'origin/dev' into wip/cmakeLiang Qi2019-09-23160-2080/+4618
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| * | | | Increase CI test coverage by changing GCC to ICCJędrzej Nowacki2019-06-171-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There is already other place in which we compile with GCC on Linux. As we use ninja now, it has to be installed on open suse too. Cmake port depends on system libraries therefore pcre2 needs to be installed. Change-Id: I92e16cc31fa60b4c591e71b58cd7235540065ac6 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>
| * | | | Fix paths when installing cmake on macOSJędrzej Nowacki2019-06-061-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This ammends d44a7a5f145ebdd49e09da358850d102f089c0df. Change-Id: I8e8644a1f8677e6e62fb6356cc6c3533ec40e454 Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@qt.io>
| * | | | Fix path to cmake installation scriptSimon Hausmann2019-06-061-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Amends commit d44a7a5f145ebdd49e09da358850d102f089c0df Change-Id: I52926a8e8c488beaeb70c9bf0222c7caa0ccfe9c Reviewed-by: Simon Hausmann <simon.hausmann@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-052-73/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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: Add ninja to the list of installed packagesLiang Qi2019-05-241-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I018e7812fc95c1db841720294a700a391246251d Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
| * | | | Provisioning: install vcpkg and some packages on Windows 10Liang Qi2019-05-032-0/+67
| | | | | | | | | | | | | | | | | | | | | | | | | 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: Add freetype to the list of installed packages on macOSLiang Qi2019-05-031-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ic2df763fc027e3a588723a37a70354d3becc29a6 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
| * | | | Provisioning: Add pcre2 to the list of installed packagesLiang Qi2019-05-031-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This external dependency is now required by QtCore on macOS. Change-Id: I4eef98e8e54f00861c1e9469dfbac61979d652e8 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
| * | | | Provisioning: build cmake from source on macOS 10.13Liang Qi2019-05-032-6/+8
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ifada0cf62d1e75e8cab3e3bbe6250718747d0703 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
| * | | | Merge remote-tracking branch 'origin/dev' into wip/cmakeLiang Qi2019-05-0392-385/+514
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: .gitmodules coin/platform_configs/default.txt coin/platform_configs/qt5.txt coin/platform_configs/qtbase.txt Change-Id: Ib25154566eb6da77f091d8f112cc1248cac9eb16
| * | | | | Provisioning: Add pcre2 to the list of installed packagesLiang Qi2019-03-151-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This external dependency is now required by QtCore on Linux. Change-Id: I47ba758e86e110c33f9e2bc7607ff9352892470a Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| * | | | | Provisioning: build cmake from sourceLiang Qi2019-03-153-5/+75
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I6b4006250a7e019d7c38eaf3c29ae75a3a65300c Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io> Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| * | | | | Add double-conversion to the list of installed packagesSimon Hausmann2019-03-131-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This external dependency is now required by QtCore on Linux. Change-Id: I910a3e17ec4d6c10ad4e1a9dfc31d1340fe110de Reviewed-by: Alexandru Croitor <alexandru.croitor@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>
* | | | | | Merge remote-tracking branch 'origin/5.14' into 5.15Liang Qi2019-12-051-6/+8
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Change-Id: If0f14c514b3c7ce7abf6b27221a26f921fef7f7f
| * | | | | | 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: Install libpopplerHeikki Halmet2019-12-031-0/+2
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Poppler test requires this package Task-number: QTQAINFRA-3253 Change-Id: Ifc0904ca020a8606b06a4032d5145fbf2f8063f1 Reviewed-by: Michal Klocek <michal.klocek@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-204-0/+87
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-185-16/+48
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: coin/provisioning/common/linux/docker.sh Change-Id: Ic5c3fcaa856137de46c6f3830ca75cedb084927d
| * | | | | Workaround broken local apt mirrorDimitrios Apostolou2019-11-141-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Local mirror is mirroring a public mirror, and for some reason there is a mismatch of file sizes and file hashes for the dep-11 metadata files. More info: https://askubuntu.com/questions/823329/how-do-i-disable-fetching-of-dep-11-files Task-number: QTQAINFRA-3351 Change-Id: Ia48936e7d0b9efb2f86fbe001f22f2bd28a7ea3d Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
| * | | | | 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: Install pre-builded openssl for Windows 7Heikki Halmet2019-11-121-3/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTQAINFRA-3224 Change-Id: I972b497e1a98f2ebbb6633158714409313cf0506 Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
* | | | | | Provisioning: Update Android NDK version to r20 for macOS 10.14Heikki Halmet2019-11-181-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTQAINFRA-3337 Change-Id: Ib14e3cc484198bb23bb611262b205144f8a8ac70 Reviewed-by: Johanna Äijälä <johanna.aijala@qt.io>
* | | | | | Use Xcode 11 on macOS 10.14Tor Arne Vestbø2019-11-142-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes: QTQAINFRA-3261 Change-Id: Ibec6b156e030b2a1b91010321178612efc0bd06b Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-04 06:15:46 +0000