aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Update submodules on '5.6' in qt55.6Qt Submodule Update Bot2018-09-083-0/+0
| | | | | Change-Id: I83d922770362c73318da7149495e868c59cdf580 Reviewed-by: Liang Qi <liang.qi@qt.io>
* Update submodules on '5.6' in qt5Qt Submodule Update Bot2018-08-262-0/+0
| | | | | Change-Id: I94a9d3fbb5669c1ee9cc8008c8d9e063c9ca41cf Reviewed-by: Liang Qi <liang.qi@qt.io>
* Update submodules on '5.6' in qt5Qt Submodule Update Bot2018-08-166-0/+0
| | | | | Change-Id: I095f7dc6f24a15e2fdd82eda6f8e73f7b79f4264 Reviewed-by: Liang Qi <liang.qi@qt.io>
* Provisioning: Windows: Security update for QNX 660 packageJoni Jantti2018-08-163-53/+1
| | | | | | | | | | | BlackBerry has released security updates for QNX 7.0.0 and 6.6.0 that we want to include in CI since out customers will most likely have them installed. Task-number: QTQAINFRA-1535 Change-Id: I5b6a0995cb9ebc7b9596b44644795920461f6f42 Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io> Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* Provision vanilla Windows 7 x86 and use itTony Sarajärvi2018-05-2532-38/+236
| | | | | | | | Task-number: QTQAINFRA-1411 Change-Id: I96eefe2e69b5cbe5d68329be2bb4273d03bb85ca Reviewed-by: Heikki Halmet <heikki.halmet@qt.io> (cherry picked from commit 372d2bb0764724cd5239ad47ad71927eef7ab090) Reviewed-by: Joni Jäntti <joni.jantti@qt.io>
* Update submodules on '5.6' in qt5Qt Submodule Update Bot2018-05-244-0/+0
| | | | | Change-Id: Ie54306399304319272f2ad0e43b96e2e02b6b174 Reviewed-by: Liang Qi <liang.qi@qt.io>
* Update submodules on '5.6' in qt5Qt Submodule Update Bot2018-05-064-0/+0
| | | | | Change-Id: Ifa10bf61d189b6f10064349e2b8726ade9ac4d85 Reviewed-by: Liang Qi <liang.qi@qt.io>
* Fix 5.6 provisioningSimo Fält2018-05-055-6/+136
| | | | | | | | | | Due to changes in Coin and tool changes 5.6 provisioning is broken. This change makes sure pip is always up to date in macOS 10.11. It also sets required SSL and SQL env variables for win7. Change-Id: Id44ee06b2eefbe973f3110152fe52dcbf6375819 Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
* Provisioning: Fix python2 in macOS 10.8Simo Fält2018-02-151-0/+67
| | | | | | | | | | | | The python installations in macOS 10.8 tier1 is a mess. There is three different installations of python2. If called python directly, we get what expected if looking at PATH. When using virtualenv we get something different, most likely the version which has linkage to that specific instance of some old virtualenv. This change will delete all existing python installations and re-installs python2. Change-Id: I223b5afa679b61ef9fcae54533bbffd0cca40c89 Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
* Provisioning: Add common shared folderHeikki Halmet2018-02-092-1/+1
| | | | | | | | | | | Common shared folder includes scripts of files which are common for all operating system families. Changes under shared folder will trigger provisioning for all platforms Change-Id: I0789f87b76876d5f92673fe2f0e72d770e5f5ea4 Task-number: QTQAINFRA-1451 Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io> (cherry picked from commit dc5f851e787821733bc67c4a0328bc3db17be775)
* Provisioning: Disable Network Time ProtocolHeikki Halmet2018-02-099-0/+104
| | | | | | | | | NTP need to be disabled from all tier2 templates Task-number: QTQAINFRA-1608 Change-Id: I89e019c23b7a194efffa011200a8c870e3a65d66 Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io> (cherry picked from commit 4eaa0170231457c90a5465f4820d29bb7f64ce3d)
* Provisioning: Fix disabling windows updatesOliver Wolff2018-02-051-2/+19
| | | | | | | | | | | On some machines the updates were already disabled, which lead to the call to disable the service failing. Now we just move on without error. Change-Id: Ia48f7164c23dfe24e24548558d582cdc0190b7e3 Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io> Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io> (cherry picked from commit 99595f44f1b3a3c35d8decc671a8933f65220cf3)
* Provisioning on windows: Fix deletion of utilsFrederik Gladhorn2018-02-051-3/+5
| | | | | | | | We want to be able to re-provision machiens without errors. The directory doesn't exist on the machine any more. Change-Id: I2b5b92037492e51aeb4d041d62f371b8546cb0a3 Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
* Fix provisioning: NotePad++ path on 64 bit windowsFrederik Gladhorn2018-02-021-6/+1
| | | | | | | | | | We install the 64 bit version of np++ which is installed in the regular program files folder. Change-Id: I702210eaf7dfae75bbfcfd9cc98d8ed96d775f61 Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io> Reviewed-by: Oliver Wolff <oliver.wolff@qt.io> (cherry picked from commit b86b3a757b473e86aae7f246d2f1a8e0ae8e54b7)
* Fix provisioning: Wait for msvc-2013 update 5 to finishFrederik Gladhorn2018-02-021-2/+1
| | | | | | | | | | | Installing Update 5 for Visual Studio 2013 Update 5 (KB2829760)... Removing C:\Windows\Temp\vs12-kb2829760.exe ... Caught System.UnauthorizedAccessException Access to the path 'C:\Windows\Temp\vs12-kb2829760.exe' is denied. Change-Id: I9fe136f0361ee21e38563dd17bf76bf4fd53747f Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io> (cherry picked from commit b1198d34020f2aa291943ac5ee2a7a1eb19dbaf3)
* Partially revert "Use vanilla OS X 10.11"Simo Fält2018-01-291-0/+55
| | | | | | | | | This partially reverts beecc6e86e1e8b9aaf4c9029c36e53a94c01a957 but also amends the script, which is not working with vanilla template. We need the virtualenv fix for pyside. Change-Id: I12c5f7a7399bd92729e81a1d2a35bceb990261ae Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
* Use vanilla Windows 10 x86_64Tony Sarajärvi2018-01-2428-35/+198
| | | | | | | | Provisioning scripts taken from 5.9 @ commit 1540a875908f904226ad48fb41da5d49b498d177 Change-Id: Iac96271bb2b08196463376b1327722c78f92d18a Reviewed-by: Matti Paaso <matti.paaso@qt.io>
* Split Common folder based on operating system familiesHeikki Halmet2018-01-24186-173/+172
| | | | | | | | | | This change will split common folder to four different folders: Linux, Unix, Windows and MacOS. Each of these folders includes scripts which are common for their operating system familes Task-number: QTQAINFRA-1451 Change-Id: I0668885da43222663a54521ce85653da697425be Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
* Temporarily remove iOS due to code signing issuesTony Sarajärvi2018-01-222-3/+0
| | | | | | Task-number: QTBUG-64477 Change-Id: Ib068425cea85cd82be8192061daa92df01f5233b Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* Provisioning: Disable NTP synchronization for WindowsJan Arve Sæther2018-01-228-0/+9
| | | | | | | | | | | | | | | | | | | | | During CI, it has been observed that some processes didn't leave their wait state. (So they were "hanging") During analysis of the event log on that CI node, we found out that at the same time those processes entered this state, the NTP client set a new time and indeed the local time of the CI node changed (it was changed 2 hours forward in our case). For the record, the processes we observed this with was jom.exe and cc1plus.exe (the latter is the g++ compiler in the mingw toolchain)). We therefore have a strong suspicion that the NTP time change was causing the CI hang, so we simply disable it. The virtual machine should anyway get the correct time from its VM host when its started. Change-Id: I1204063399e2a4741b7b26b79858759c1bc5eab2 Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@qt.io> (cherry picked from commit 3653630d229390c9ce5517afcce371860d2ad822) Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
* Provisioning: Install signing tools to osx 10.11Heikki Halmet2018-01-221-0/+138
| | | | | | | | | | Install needed certificates and signing tools which are needed when signing release packages Task-number: QTQAINFRA-1617 Task-number: QTBUG-64477 Change-Id: Ifaefd0e93baa396479380df0b8b99b8b2f1e2017 Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
* Update submodules on '5.6' in qt5Qt Submodule Update Bot2018-01-229-0/+0
| | | | | Change-Id: Ie19da83c29c3ab77d1463ba7cf14e8e8258931c3 Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
* Use vanilla OS X 10.11Tony Sarajärvi2018-01-2229-61/+1110
| | | | | | | | | | | The old version takes up 60GB of disk space which we need to deploy to all hosts building Qt. As this adds up, should use the same tier1 images as all the other branches also use. Task-number: QTQAINFRA-1629 Task-number: QTBUG-64729 Change-Id: I132b65c381a097333577f3132dc61b87da1c78da Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
* Update submodules on '5.6' in qt5Qt Submodule Update Bot2017-09-2335-0/+0
| | | | | Change-Id: Ibafa1abb3f6dae7532892444618490f835ba78cb Reviewed-by: Liang Qi <liang.qi@qt.io>
* Merge remote-tracking branch 'origin/5.6.3' into 5.6Liang Qi2017-09-1812-2/+101
|\ | | | | | | | | | | | | Conflicts: .gitmodules Change-Id: I3f5310cfb9b839e622ab606fd674a58d50515c0c
| * Ensure 'clean' android Installationv5.6.3Heikki Halmet2017-09-151-1/+7
| | | | | | | | | | | | | | | | Remove old android installation and make sure new 'clean' android folder is created. Change-Id: I4c561797791e08976b07a194c2c9ed2f5aa302bb Reviewed-by: Simo Fält <simo.falt@qt.io>
| * Provision and build QNX660 on Win 10 x64Tony Sarajärvi2017-09-143-0/+49
| | | | | | | | | | | | | | | | | | Changes the mingw from 4.9 to 5.3. Task-number: QTQAINFRA-1208 Change-Id: I360b9806c35e597a4b9fd0d57c10eebfb8643905 Reviewed-by: Sami Nurmenniemi <sami.nurmenniemi@qt.io> Reviewed-by: Simo Fält <simo.falt@qt.io>
| * provisioning: install MinGW 530 and 630 for Win10 x64Tony Sarajärvi2017-09-143-0/+44
| | | | | | | | | | | | | | | | | | | | | | | | | | | | MinGW is an alternative option for Visual Studio. It's used to create desktop builds and for cross compiling Android and QNX. At this point it is still unclear which version is going to be used for what, but as both are supported, let's think ahead and provide them both. This also allows us to debug with the other, if the other is causing problems. Task-number: QTQAINFRA-1289 Change-Id: I2a922669c07d49370e608c093be80481c8613dc7 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
| * Provisioning: Invoke installer with Start-ProcessTony Sarajärvi2017-09-141-1/+1
| | | | | | | | | | | | | | | | | | | | By launching an installer with Start-Process and -Wait, we make sure no handles are left holding on to the installer when we try to delete it at cleanup. Change-Id: Ic9b700ea1ce9e70089ba4cb7e91d9765ca976333 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io> Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@qt.io>
| * Provision: Move Python3 scripts from win8 to win8.1 folderTony Sarajärvi2017-09-144-0/+0
| | | | | | | | | | | | | | | | Task-number: QTAUTO-345 Task-number: QTBUG-63133 Change-Id: I739e18a7fcb1abc72092f91662e506cfffcecb0c Reviewed-by: Dominik Holland <dominik.holland@pelagicore.com> Reviewed-by: Simo Fält <simo.falt@qt.io>
| * Update submodules on '5.6.3' in qt5Qt Submodule Update Bot2017-09-141-0/+0
| | | | | | | | | | Change-Id: I44fb9a11d14313805600ffa2f55a8f465f2307bc Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
| * Update submodules on '5.6.3' in qt5Qt Submodule Update Bot2017-09-071-0/+0
| | | | | | | | | | Change-Id: Idc2fc0d0cc1df4929c783116169f95210baa4b70 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
| * Update submodules on '5.6.3' in qt5Qt Submodule Update Bot2017-09-0723-0/+0
| | | | | | | | | | Change-Id: Ic62656a48bcee76ff38849671ca3fbad7e58fc73 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
| * Adjust submodule branchesFrederik Gladhorn2017-09-041-34/+34
| |
* | Provisioning: Fix shasum pathSimo Fält2017-09-081-1/+1
| | | | | | | | | | | | | | | | | | | | | | Commit c48355ebb58cb058df5b2ca519b6b89fbd09f380 changed the path of shasum, which was not intended. While the DownloadURL.sh utility is used by rhel in addition to macOS we can't rely on /usr/bin/shasum but we have to use the one found from PATH. Change-Id: I67bb37dcb72ba3d8d1f279646e44228b27137ec9 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | Provisioning: Fix DownloadURL utility's shasum checkSimo Fält2017-09-051-1/+2
| | | | | | | | | | | | | | | | MacOS 10.10 has older shasum tool, which does not support oneliner verification. Change-Id: If00b846d5772aa1991960675d022249d63e7bd77 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | Provisioning: Hide powershell progress bar for performanceTony Sarajärvi2017-09-041-0/+1
| | | | | | | | | | Change-Id: I74abdcc2e7d2dccf4f85cd64fe5fb4b56e54d613 Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
* | Fix Add-Path helper function and start using it in scriptsJoni Jäntti2017-09-044-5/+7
|/ | | | | | | | This function was broken and only added the latest addition to the actual PATH. Change-Id: Ida352c7b605c1b9748bb98e4f51ce68a765c3ce3 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* Build Windows MSVC2013 & MSVC2015 32bit binaries on 64bit hostAkseli Salovaara2017-09-041-2/+2
| | | | | | | | | | From Qt 5.6.3 onwards building QtWebEngine Windows 32bit binaries requires Windows 64bit machine. Linking requires more RAM than Windows 32bit can address. Change MSVC2013 & MSVC2015 integration host machines accordingly. Change-Id: I5b88536507dcf59efd124d4e8c3ead79772021fb Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* Add UploadConfigureExe featureAapo Keskimolo2017-09-022-13/+13
| | | | | | | | | We used to solve the requirement for uploading configure.exe from product version, but we can add this as a feature and remove the dependency to product version. Change-Id: If671e7193771453cd5cd41e881875c44ff0992fb Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
* Provision vanilla Windows 8.1 x86 and use itTony Sarajärvi2017-09-0140-92/+241
| | | | | | | | | | | | | Replaces existing Windows 8 x86 builds with a vanilla tier 1 image that gets all needed software provisioned except for VS2013 that is pre-installed. Also modifies existing provisioning scripts under common to support this 32bit OS. Task-number: QTQAINFRA-1383 Change-Id: I495cb2d78b4d2d8b2abb9af1254fff0a78a570d9 Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
* Update submodules on '5.6' in qt5Qt Submodule Update Bot2017-09-011-0/+0
| | | | | Change-Id: Idfea61ecc744f07c6212fa4f29de808103393702 Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
* provisioning: windows: ICUJoni Jäntti2017-09-011-2/+118
| | | | | | | | Fixed ICU script to actually install ICU instead of just setting the environment variables. It is required to build qtwebkit. Change-Id: I8881f9c11599d99b4d400595c9b929cf6f37088a Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
* Make CI use a new provisioned Win 10 templateJoni Jäntti2017-09-0113-4/+15
| | | | | | | | | | | | 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 10 template. Task-number: QTQAINFRA-1263 Change-Id: Ieeb2ae3c53841644996d99ca86228df6f825a63a Reviewed-by: Simon Hausmann <simon.hausmann@qt.io> Reviewed-by: Joni Jäntti <joni.jantti@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
* Install python3 on all platformsSimo Fält2017-08-3018-1/+319
| | | | | | | | | | | Python3 is required in 5.6 by pyside-setup. Task-number: QTAUTO-345 Change-Id: If11ca425fa08cce8a518710ded0a6ec58159343d Reviewed-by: Simon Hausmann <simon.hausmann@qt.io> (cherry picked from commit a5f3f8ed482d314d092e1a6ddc5568839bb59c74) (cherry picked from commit a7658388892bc70c3c5f3a6f6e31639ef5b766d1) (cherry picked from commit 1859f9b26ce0177cb83e917148b10ff08bb25db7)
* Update submodules on '5.6' in qt5Qt Submodule Update Bot2017-08-305-0/+0
| | | | | Change-Id: If6a7d9a6d34a5e25459c1c3bca1ef55f923eeeae Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* Fix code duplication for cmake installation on LinuxSimon Hausmann2017-08-303-106/+55
| | | | | | | Share the code for installing cmake on Linux. Change-Id: I535f2696151ea4db26dc7194a1fe7016799ed0e2 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* Fix adding to path lines for Windows provisioning scriptsJoni Jäntti2017-08-302-1/+6
| | | | | | | | | | | Currently the path addition command will forget the previous addition when adding a new string. This hasn't been found out because python was the only script using this command. Now we also need to set the path for ruby, so the python string is left out. Change-Id: I39721d78111550189e52a9f095030033f9660c0a Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io> Reviewed-by: Joni Jäntti <joni.jantti@qt.io>
* 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>