aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Provisioning: Fine tune cmake provisioning scriptTony Sarajärvi2017-08-301-4/+51
| | | | | | | | Add version printing and move version strings to variables for easier reuse. Change-Id: I5372872bf455609dfb7cc7bbcf7a110cd71933fb Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
* Provisioning: Add $PATH properly in .bashrcTony Sarajärvi2017-08-302-2/+2
| | | | | | | | | | | If we, in a provisioning script, add $PATH to another file, that $PATH gets expanded there and now. We need it written as $PATH to the target file, so that it gets expanded when the other file is run. Not at the moment of running this provisioning script. Change-Id: Id963f0f8b1cc74b02d35c1a91eb974ed816839ab Reviewed-by: Simo Fält <simo.falt@qt.io>
* Provisioning: Disable system updatesHeikki Halmet2017-08-165-0/+56
| | | | | | | | This change will disable system updates from App Store to prevent unnecessary network load Change-Id: I7915ec6ffce681a850abef59d58f953effd6deb0 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* Update submodules on '5.6' in qt5Qt Submodule Update Bot2017-08-165-0/+0
| | | | | Change-Id: I5e3b9c2b92ee4403054820cd6a902c9dfbac0e0f Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* Make CI use a new win 8.1 provisioning instead of win 8Joni Jäntti2017-08-1159-206/+810
| | | | | | | | | | | | | Added all the provisioning scripts that install required programs and make changes to certain settings. These are needed to build qt5. This replaces the old Windows 8 template. Made all the Windows platforms use the scripts under provisioning/common/ instead of duplicate files. Task-number: QTQAINFRA-1357 Change-Id: Ic3f0b50079b212437fff711379f243753ab84872 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* Update provisioning scripts with new intra.qt.io addressTony Sarajärvi2017-08-0814-20/+20
| | | | | Change-Id: I9b4c5e9d0fe8e0e84596ad9086f563d11e97930b Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* Update submodules on '5.6' in qt5Qt Submodule Update Bot2017-08-082-0/+0
| | | | | Change-Id: I3fc0805275d848bc4323e521ecfdf5cc06a518f4 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* Update submodules on '5.6' in qt5Qt Submodule Update Bot2017-08-061-0/+0
| | | | | Change-Id: I5e7608f87019c2aed077dc85963b1c349c17824e Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* Update submodules on '5.6' in qt5Qt Submodule Update Bot2017-08-052-0/+0
| | | | | Change-Id: I3da0ef78a783a692825f8bc7000d28c8b35fb7b6 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* Remove unused provisioning scriptsSimon Hausmann2017-08-047-167/+0
| | | | | | | | | RHEL 7.2, Ubuntu 15.04, 16.04 and OpenSuSE 42.1 are not used in the Qt 5.6 branch. Let's remove the scripts to avoid confusion. Change-Id: I3829ea320ad77ebd25c9cf5bebfeed89f37f44dc Reviewed-by: Simo Fält <simo.falt@qt.io> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
* Add Documentation feature to one Ubuntu 14.04 buildFrederik Gladhorn2017-08-041-1/+1
| | | | | | | | | When creating packages, we build the docs on one configuration. Previously that was done by magic inside the continuous integration system. Make it a bit less magic by having a flag for it. Change-Id: Iee5be7037023929b319beffaacb1592dc87d6078 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* Update submodules on '5.6' in qt5Qt Submodule Update Bot2017-08-014-0/+0
| | | | | Change-Id: Ic0bc89be8a9b0d3dda06f6f43bbe21e60032a65f Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* Turn off line ending conversion for .commit-templateJoerg Bornemann2017-07-211-1/+1
| | | | | | | | | | | | | | | | | | | | | When committing a change, the automatically generated git commit message consists of 1) The content of .commit-template 2) Informative text for the current commit, generated by git. While 2) always has LF line endings, even on Windows, 1) might have CRLF line endings if core.autocrlf=true. The result is a text with mixed line endings. With the default editor vim, every line of the commit template part ends with ^M. Fix this by forcing the line endings of .commit-template to be LF regardless of core.autocrlf. Change-Id: I6db825695466d7f48f1fa4f771d83fb872fdb576 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io> Reviewed-by: Oliver Wolff <oliver.wolff@qt.io> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
* Provisioning: Fix virtualenv in macOS 10.11Simo Fält2017-07-191-0/+17
| | | | | | | | | | There are multiple Python installations in our macOS 10.11 Tier1 template. Most of them are pretty old and not even working properly. One of the affected Python tool is virtualenv, which atm is creating Python 2.6 env by default even if Python 2.7 is the default Python. Change-Id: I8bc0900976a9dc79637539802345175c85b7b433 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* Use updated Ubuntu 14.04 in CIJędrzej Nowacki2017-07-181-4/+4
| | | | | | | | | | | | | The system packages in the base template were updated via apt-get on 12.07.2017. We hoped that it will solve mysterious problem of a network interface being randomly disabled. Sadly we had no luck, but getting all security updates also make sense. Change-Id: I34d7a56a2c5530376f74bb35faf461e2e18da14a Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* Update submodules on '5.6' in qt5Qt Submodule Update Bot2017-07-123-0/+0
| | | | | Change-Id: Id5ae5de68635938bc402242a3d98cb3765154d43 Reviewed-by: Liang Qi <liang.qi@qt.io>
* Update submodules on '5.6' in qt5Qt Submodule Update Bot2017-07-062-0/+0
| | | | | Change-Id: I8701d1b838be1730ccaaa2835c47e0389bb4bcc3 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* Update submodules on '5.6' in qt5Qt Submodule Update Bot2017-07-041-0/+0
| | | | | Change-Id: I5f1e4425bf98dd9fba31f21392dfec9d991ebf7d Reviewed-by: Liang Qi <liang.qi@qt.io>
* Update submodules on '5.6' in qt5Qt Submodule Update Bot2017-06-303-0/+0
| | | | | Change-Id: I077670116fb8fa2fdce44a0260aacfedf16234c6 Reviewed-by: Liang Qi <liang.qi@qt.io>
* Update submodules on '5.6' in qt5Qt Submodule Update Bot2017-06-264-0/+0
| | | | | Change-Id: I0c2e8c0756239c679a2442c164c1eafa5b21f84e Reviewed-by: Liang Qi <liang.qi@qt.io>
* Centralize Mesa LLVMPipe installation on WindowsSimon Hausmann2017-06-207-11/+68
| | | | | | | | | | | Install the DLL for general availability on all Windows systems. Due to its distinct name it will not be picked up by anyone unless Qt explicitly selects it. This gives us the ability to choose the GLES backend to use in Qt. Change-Id: Ie36f202ead7080a8f7690734d305bd27f0c9f56b Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
* Update submodules on '5.6' in qt5Qt Submodule Update Bot2017-06-176-0/+0
| | | | | Change-Id: I6c6a2f3d51f4899809810123112081a47f054358 Reviewed-by: Liang Qi <liang.qi@qt.io>
* Fix Postgresql and Mysql environment variablesSimon Hausmann2017-06-122-8/+8
| | | | | | | | | | | | | | | | | | The correct paths to the headers are c:\utils\postgresql[x86]\pgsql\include not c:\utils\postgresql[x86]\pgsql\pgsql\include Same for libs. Regression introduced by commit ce47238ed94f3a989c13fef93b037904589910cf but only noticed in the 5.9 branch. Change-Id: Ib16072c0cc1c52f743f5500bc9732c8b04e962c7 Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
* Remove QNX Windows buildsSimon Hausmann2017-06-071-2/+0
| | | | | | | | | We can't get those to work with the faster KVM based VMs, so disable these builds for the time being. Task-number: QTQAINFRA-1208 Change-Id: I74c19374d57e3f84d8f982b95aade4a779623228 Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
* Disable tests on macOS 10.10Simon Hausmann2017-06-071-1/+1
| | | | | | | | | | | We cannot run graphical tests reliably on 10.10 anymore with the new virtualization without vmware. As outlined in the referenced task, we occasionally get the Window Server locking up. So for the time being, this change disables testing on 10.10. Task-number: QTQAINFRA-1198 Change-Id: I020d4a298562554838cd7e898df52438db536d7a Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
* Clean up windows cleanup scriptSimon Hausmann2017-06-066-6/+6
| | | | | | | | | | | | | * There's no need to have a numbered prefix in the common directory * Instead of deleting directories trees worth several gigabytes of data, just rename the directory. The underlying storage system is copy-on-write and so deleting the files produces more data than just moving the directory out of the way. Deleting the files does not actually free up any physical disk space. Change-Id: I6de02d56f3485651726ea11183ce7571d5b61520 Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io> Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
* Speed up Windows installation of cmake, python, opengl, mysys and AndroidSimon Hausmann2017-06-067-10/+10
| | | | | | | | | We're better off copying off the internal server using CIFS than using PowerShell's incredibly slow Invoke-WebRequest. Change-Id: Ic39cf08be70335e9309575d543155bffaceb0db0 Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io> Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
* Speed up Visual Studio update installationSimon Hausmann2017-06-063-34/+62
| | | | | | | | | | We have a prepared package on the internal server that has everything necessary included. This way we do not have to download the actual update content from the internet. Change-Id: Ie4cb3116a4f91a47df5be1c2b2e473d7ddec9a78 Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io> Reviewed-by: Aapo Keskimolo <aapo.keskimolo@qt.io>
* Improve Postgresql installation on WindowsSimon Hausmann2017-06-063-23/+44
| | | | | | | | | Similar to the mysql change (parent commit) it's faster to rename any older artifacts and install only what we need. This also generalizes the zip archive extraction code for "dev" packages. Change-Id: I3ad1f23efaed80fab3e0778a3e8c46317138f1ad Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
* Improve mysql installationSimon Hausmann2017-06-061-44/+34
| | | | | | | | | | | | | | | | | | * Instead of deleting the files from a previous installation, which will not actually release any disk space but just make the qcow2 file larger, let's just rename the directory the old files are in. That is a significantly faster operation. * When extracting the zip archive, only extract what we need for Qt: Libraries, binaries and headers. We can skip the installation of several thousand documentation files for example, which takes a long time. * Instead of downloading the zip archive via PowerShell's Invoke-WebRequest we can get the data much faster using CopyItem off the CIFS share. As a bonus this is also more robust against download failures. Change-Id: I9128bd70e5f4a4ebcdbf046765e76b63bad033a5 Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
* Update submodules on '5.6' in qt5Qt Submodule Update Bot2017-06-035-0/+0
| | | | | Change-Id: I436caf993701906de211398fe51ce4d2882ad5a0 Reviewed-by: Liang Qi <liang.qi@qt.io>
* Update submodules on '5.6' in qt5Qt Submodule Update Bot2017-05-297-0/+0
| | | | | Change-Id: I0d0ee51f8952a7739b16f37ae526c14f44fb2ec7 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* MSVC 2017 updated and missing component for winrt armHeikki Halmet2017-05-036-7/+93
| | | | | | | | | | | MSVC 2017 and Build Tools updated to version 15.1. Also missing component 'Visual C++ compilers and libraries for ARM' installed for winrt arm Also script added to storage msvc version numbers to versions.txt Change-Id: I015e15d5d613b178c1266a2aecee5c3270780486 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* get rid of custom 'qt' gitmodules propertyOswald Buddenhagen2017-04-272-3/+3
| | | | | | | | | | | | | | instead, re-use the (also custom) 'project' property with the magic value '-' to flag modules which contain no project files at all. Change-Id: I33163c098852e1b79ad698115aac98217efe1157 Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io> Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@qt.io> Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io> Reviewed-by: Aapo Keskimolo <aapo.keskimolo@qt.io> Reviewed-by: Eike Ziller <eike.ziller@qt.io> Reviewed-by: Iikka Eklund <iikka.eklund@qt.io> Reviewed-by: Jake Petroules <jake.petroules@qt.io>
* Update submodules on '5.6' in qt5Qt Submodule Update Bot2017-04-272-0/+0
| | | | | Change-Id: Iadc5070366d65f98c81af02f4926c2ebfb1ae294 Reviewed-by: Liang Qi <liang.qi@qt.io>
* Improve Android SDK/NDK installation on macOSSimon Hausmann2017-04-242-123/+10
| | | | | | | | | | | | * Remove unused installation on macOS 10.10 as we only build packages on 10.11. * Replace the use of the ~1GB downloads of the zip files with a direct extraction via NFS. This is more resilient to flakyness in the network connection. Change-Id: I1bfe5bbf00a6614233b517801daf130069094ec9 Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
* Provisioning: MSVC 2017 Build ToolsHeikki Halmet2017-04-244-5/+101
| | | | | | | MSVC 2017 build tools are pre-provisioned to windows 10 templates Change-Id: I98d857101ad209acd6eea9f821e367e514359d8c Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* ignore submodules in dirtiness checkOswald Buddenhagen2017-04-231-1/+1
| | | | | | | | changed submodule sha1s should not prevent updating. Change-Id: Ibd4480bed91de2a04719c32c95a4c603eda4c44b Reviewed-by: Simon Hausmann <simon.hausmann@qt.io> Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
* Update submodules on '5.6' in qt5Qt Submodule Update Bot2017-04-235-0/+0
| | | | | Change-Id: Ic7e8b19d68ab1adb24604230e64e40353de11bd7 Reviewed-by: Liang Qi <liang.qi@qt.io>
* Update submodules on '5.6' in qt5Qt Submodule Update Bot2017-04-143-0/+0
| | | | | Change-Id: I30e320be0c03efc38d0ede024f5678e3a9c4d307 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* Provisioning: Change tier1 templates for Windows 10Heikki Halmet2017-04-136-6/+162
| | | | | | | | These tier 1 templates includes changes needed by 5.9, but we can use these same tier 1 templates for 5.6 also Change-Id: I3ad0d75ab89f7b6502b758fb94f984cc6e0b7f16 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* Fix provision help script DownloadURL.shTony Sarajärvi2017-04-101-0/+4
| | | | | | | | The script neglected the result of the sha1 after download. Even with a failure it exited nicely. Change-Id: I6c0e25c2b764a0ad54acbe317eddf395a56d7f1c Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
* serialize build of qtwebkit and qtwebengineOswald Buddenhagen2017-04-062-2/+3
| | | | | | | | | | | linking both at the same time requires more than my 16GB of RAM, so introduce a .gitmodules field which serializes the two. in practice, it is just interpreted as an optional dependency. the CI system won't be taught about it, so this will not cause an unnecessary serialization there. Change-Id: I938537ebd3767a1184a5a31c4c026c70a05d499a Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* fix url normalizationOswald Buddenhagen2017-04-061-1/+1
| | | | | | | | | | after 8c0390143, we cannot rely on the denormalized segment starting with a slash any more. Task-number: QTBUG-59753 Change-Id: Ia3a3c005d1f41320747a60efc48a180caa88206b Reviewed-by: Edward Welbourne <edward.welbourne@qt.io> Reviewed-by: Valentin Fokin <fokinv@inf.u-szeged.hu>
* Update submodules on '5.6' in qt5Qt Submodule Update Bot2017-04-064-0/+0
| | | | | Change-Id: I89f138e0d359d429864351172c5d7cdc6475590c Reviewed-by: Liang Qi <liang.qi@qt.io>
* Update submodules on '5.6' in qt5Qt Submodule Update Bot2017-04-018-0/+0
| | | | | Change-Id: I31ee5d48a4cdf6d7a28f9ec7b19c87b04f4b4e06 Reviewed-by: Liang Qi <liang.qi@qt.io>
* Provisioning: Bug fix patch for msvc 2015 update 3Heikki Halmet2017-03-312-0/+100
| | | | | | | This bug fix patch is needed for QtWebEngine Change-Id: Id2c624461fbe27d9fd12a149281cae324bf8b14e Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* Coin provisioning: Use arg instead of autodetecting architectureSimo Fält2017-03-3012-32/+28
| | | | | | | | | When provisioning windows machine, it seems that detecting architecture by checking [System.Environment]::Is64BitProcess doesn't work properly. Instead pass 32 or 64 as an argument when calling powershell script. Change-Id: I890ad141b8ef194275848d0e656431753463cd2b Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
* Provisioning: Move Visual Studio installation to pre-provisioningHeikki Halmet2017-03-226-71/+10
| | | | | | | | | | | Visual Studios will be pre-provisioned to tier1/vanilla os when visual studio update is needed. Even if using pre-configured offline installer with specific workload and components the installation is still taking too long. This way we'll reduce provisioning time significantly Change-Id: I1f831aef648716dc640ce9cbfb4e63aa54e7afd0 Reviewed-by: Akseli Salovaara <akseli.salovaara@qt.io>
* Update submodules on '5.6' in qt5Liang Qi2017-03-201-0/+0
| | | | | Change-Id: I8050d2b9f1f2d3ad55f64c139410abc09f21dc6e Reviewed-by: Liang Qi <liang.qi@qt.io>