aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Update submodules on '5.10' in qt5Qt Submodule Update Bot2018-01-0741-0/+0
| | | | | Change-Id: I8d3a6f72435d9bd1cf23146656b5bcef958e993d Reviewed-by: Liang Qi <liang.qi@qt.io>
* Merge remote-tracking branch 'origin/5.9' into 5.10Liang Qi2018-01-06170-156/+672
|\ | | | | | | Change-Id: I7119e6e1853b0eef2b695fb8165518e90b18d250
| * Merge remote-tracking branch 'origin/5.9.4' into 5.9Liang Qi2018-01-051-0/+5
| |\ | | | | | | | | | | | | | | | | | | Conflicts: .gitmodules Change-Id: I6a2446b8ed4212e3965b37cb2c25f35ba6ed7efc
| | * Provisioning: Ubuntu16.04 - CMakeJoni Jantti2018-01-051-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | CMake is missing from the clean installed Ubuntu 16.04. Change-Id: I965bc3e55eb9b0765f483a84e5584e61054bdd80 Reviewed-by: Heikki Halmet <heikki.halmet@qt.io> Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
| | * Merge remote-tracking branch 'origin/5.9' into 5.9.4Jani Heikkinen2018-01-05175-157/+662
| | |\ | | | | | | | | | | | | | | | | | | | | This merge wasn't done during final downmerge from '5.9' -> '5.9.4' Change-Id: I516c24ba52575634f3932ff4f40221f31ef06ee0
| | * | Adjust submodule branchesOswald Buddenhagen2017-12-221-39/+39
| | | | | | | | | | | | | | | | Change-Id: I3d6535fee48d27c87aab32847f5486a331402df1
| * | | Update submodules on '5.9' in qt5Liang Qi2018-01-0513-0/+0
| | | | | | | | | | | | | | | | | | | | Change-Id: I95a01ff67b3d16a9a989e3b714f82c94a92d6dc4 Reviewed-by: Liang Qi <liang.qi@qt.io>
| * | | Provisioning: Ubuntu 16.04 - Set timezone to UTCJoni Jantti2018-01-051-0/+6
| | |/ | |/| | | | | | | | | | | | | Task-number: QTBUG-65435 Change-Id: I329926d0f83d47c9e69eee177c600ac629ee9415 Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
| * | Set up proxy for provisioning scriptsTony Sarajärvi2018-01-029-1/+165
| | | | | | | | | | | | | | | | | | Task-number: QTQAINFRA-1669 Change-Id: I582dc5037bd2b46dcd5c9c3b2cb13784e122d6a5 Reviewed-by: Simo Fält <simo.falt@qt.io>
| * | Fix shebangs and give provisioning scripts +x rightsTony Sarajärvi2018-01-0279-69/+80
| | | | | | | | | | | | | | | Change-Id: Ib85721600b1e4461470a9ea4fd3b29fca0b35633 Reviewed-by: Simo Fält <simo.falt@qt.io>
| * | Add set -ex to 7z provisioning in RHEL 7.4Tony Sarajärvi2018-01-021-0/+3
| | | | | | | | | | | | | | | | | | Change-Id: If6323055999830954df6893d72ff2031b34f0276 Reviewed-by: Joni Jäntti <joni.jantti@qt.io> Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
| * | Fix the Tier1 image that qtbase builds qemu builds withTony Sarajärvi2018-01-021-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Commit fcc0feaacb91ab5aefb212d351dcea7c728eefa5 forgot to update the Tier1 image in qtbase.txt. It only updated default.txt and qtdeclarative.txt. Most likely because qtbase.txt was added after initial changes were made and not caught in rebase. Task-number: QTQAINFRA-1574 Change-Id: If5da006172037c27dec5b3ae0b14330bc6f0149f Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
| * | Update submodules on '5.9' in qt5Qt Submodule Update Bot2017-12-294-0/+0
| | | | | | | | | | | | | | | Change-Id: Id3233e66cce60596a1523a8685ee593a8dec19f2 Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
| * | Make provisioning script prefix style match across platformsJoni Jantti2017-12-29123-12/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently we are using different styles and amount of digits for the provisioning script prefixes. This change will unify them across the platforms. Also removes a couple of duplicate files. Task-number: QTQAINFRA-1668 Change-Id: I039777e7616bccc29c6a4ac55db13326ae8dc87c Reviewed-by: Joni Jäntti <joni.jantti@qt.io> Reviewed-by: Simo Fält <simo.falt@qt.io>
| * | Provisioning: VirtualBox for RTAJoni Jantti2017-12-292-0/+54
| | | | | | | | | | | | | | | | | | | | | | | | RTA needs VirtualBox for running GammaRayPlugin RTA tests. Task-number: QTQAINFRA-1661 Change-Id: If66d6a63355ed5cc8c8525408c2dfc8c4f3d1bac Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
| * | Add clean Ubuntu 16.04 provisioningJoni Jäntti2017-12-2910-31/+165
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently Ubuntu 16.04 template has stuff installed on its tier 1. We want to have a clean installed tier 1 and install everything on it during provisioning. This will save some disk space on our hosts. Task-number: QTQAINFRA-1574 Change-Id: Ia7e6df62835a8e31943c00996f12ac70c6c71aed Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
| * | Add set -ex to provisioning scripts for openSUSE-42.3Joni Jantti2017-12-277-3/+13
| | | | | | | | | | | | | | | Change-Id: I71fb0074bc07ce3085401ac23be77ea32e52dcfa Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
| * | Add set -ex to provisioning scripts for RHEL 6.6Joni Jantti2017-12-277-0/+19
| | | | | | | | | | | | | | | Change-Id: I6e6e66cffcbd84af1e093176d65751063492122b Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
| * | Add set -ex to provisioning scripts for Ubuntu-16.04Joni Jantti2017-12-274-1/+8
| | | | | | | | | | | | | | | Change-Id: Icc4b58080875255d8c2efe3e5db2c05e18127606 Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
| * | Add set -ex to provisioning scripts for macos-10.12Joni Jantti2017-12-2720-0/+45
| | | | | | | | | | | | | | | Change-Id: Ieea4f84909c552728614a4d3c23d4c8ab9134fb2 Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
| * | Add set -ex to provisioning scripts for osx-10.10Joni Jantti2017-12-277-0/+15
| | | | | | | | | | | | | | | Change-Id: I732df317aa0016b1d970e0d37167a3fc9276a645 Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
| * | Add set -ex to provisioning scripts for osx-10.11Joni Jantti2017-12-2715-1/+33
| | | | | | | | | | | | | | | Change-Id: I56ecd39a553b8b777eac0f8822cfd3263e972ef5 Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
| * | Remove provisioning of ICU for VS2012Tony Sarajärvi2017-12-271-36/+0
| | | | | | | | | | | | | | | | | | | | | Visual Studio 2012 isn't used in our builds. Change-Id: I7f2480a1811efd1c1f164f468407ab55d5c4102d Reviewed-by: Simo Fält <simo.falt@qt.io>
| * | Provision fbx to RHEL 7.4 for 3DStudioTony Sarajärvi2017-12-271-0/+5
| | | | | | | | | | | | | | | Change-Id: I2aaad4abc2e3d42bdd1f5204d20ee4fea3c0388f Reviewed-by: Simo Fält <simo.falt@qt.io>
| * | Add set -ex to provisioning scripts for RHEL 7.4Tony Sarajärvi2017-12-2713-4/+58
| | | | | | | | | | | | | | | | | | | | | Task-number: QTQAINFRA-1659 Change-Id: I9e3c1ec559eab29ccb693956201fc2b63f999882 Reviewed-by: Joni Jäntti <joni.jantti@qt.io> Reviewed-by: Simo Fält <simo.falt@qt.io>
| * | Update submodules on '5.9' in qt5Qt Submodule Update Bot2017-12-243-0/+0
| | | | | | | | | | | | | | | Change-Id: I88561b7971943d494f81fe309d849f5c0d94d2e3 Reviewed-by: Liang Qi <liang.qi@qt.io>
* | | Add Apple tvOS and Apple watchOS configs for all modulesJake Petroules2018-01-051-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | ...not just qt5. This will eliminate the semi-frequent integration failures in qt5 submodules updates. Change-Id: I99a4eb1cf41005adcfd12e385b663a5d8adbc628 Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
* | | Merge remote-tracking branch 'origin/5.9' into 5.10Liang Qi2017-12-2210-38/+30
|\| | | | | | | | | | | | | | | | | | | | Conflicts: coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/002-zypperpackages.sh Change-Id: I5aaf8fa93f7a9f06e30b9730703e8d1e018cb1f7
| * | Fix Android provisioning scriptSimo Fält2017-12-221-1/+1
| |/ | | | | | | | | | | | | | | | | | | We have to accept extra license to enable installing all required packages. Task-number: QTQAINFRA-1660 Change-Id: I9d014991be96ff0723688b317a645e281b3e92d0 Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io> (cherry picked from commit 5df4ec2ec999440ba291f2bf2f9fa6b72810660d)
| * Remove unneeded OS X provisioning scriptsTony Sarajärvi2017-12-225-15/+0
| | | | | | | | | | | | Change-Id: Icf03c93adee31baac383d1394857df8c2df4fe59 Reviewed-by: Joni Jäntti <joni.jantti@qt.io> Reviewed-by: Simo Fält <simo.falt@qt.io>
| * Remove 'Packaging' flag from builds we don't need itJani Heikkinen2017-12-222-3/+3
| | | | | | | | | | | | | | | | | | We don't offer binaries for INTEGRITY, MSVC2013 32 bit or MSVC2017 32bit so we don't need 'packaging' flag there either Task-number: QTBUG-65324 Change-Id: If9e8fdebab44fcafde9b4da893be6f79f6287aac Reviewed-by: Iikka Eklund <iikka.eklund@qt.io>
| * Update submodules on '5.9' in qt5Qt Submodule Update Bot2017-12-2213-0/+0
| | | | | | | | | | Change-Id: Ice93ecfe5e5c093c7bf455c05b87383cf157ed2e Reviewed-by: Liang Qi <liang.qi@qt.io>
| * Simplify apt package installation and disable daily package maintenanceSimon Hausmann2017-12-201-19/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Instead of using aptdcon, we can continue to use apt-get to install the software. We just need to make sure that the automatic update and package upgrade services are disabled. This is generally desirable as we do not want these kind of activities to occur in the background while building or running tests. This also fixes the broken package installation via regex, which apt-get supports but aptdcon does not. Revert "Fix Ubuntu 16.04 random provisioning fail" This reverts commit 537ea17d14526bc6564765e2dd4652e11a3ed235. Conflicts: coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/002-apt.sh Change-Id: I920e5132bb0a248d3794e1efcf01ce78d28e6ee3 Reviewed-by: Joni Jäntti <joni.jantti@qt.io> Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io> Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@qt.io>
| * Update submodules on '5.9' in qt5Qt Submodule Update Bot2017-12-206-0/+0
| | | | | | | | | | Change-Id: I85ef0fa0ae59f600ab53e9b566a08b2f22184f33 Reviewed-by: Liang Qi <liang.qi@qt.io>
| * Install cups-devel in OpenSuseAlbert Astals Cid2017-12-181-0/+3
| | | | | | | | | | | | | | This way we have one build that compiles the "with cups" branch and others (the ubuntu ones) that compile the "without cups" code branch Change-Id: I45ab3d72c34367789e0f344c917a88269883cffe Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
| * Update submodules on '5.9' in qt5Qt Submodule Update Bot2017-12-189-0/+0
| | | | | | | | | | Change-Id: Ibdf2e0ca968b4fa5c0a5be8c6bfc1d05aa90d17d Reviewed-by: Liang Qi <liang.qi@qt.io>
* | Update submodules on '5.10' in qt5Qt Submodule Update Bot2017-12-204-0/+0
| | | | | | | | | | Change-Id: I84aaff41d77d31eb5c4c9aae973aaccd879ede3e Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* | Add libxml2 and libxslt to RHEL 7 for QtWebKitKonstantin Tokarev2017-12-191-0/+3
| | | | | | | | | | Change-Id: I5c50ee482aa20f0d9959915c81d2c44cccce6dca Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
* | Update submodules on '5.10' in qt5Qt Submodule Update Bot2017-12-196-0/+0
| | | | | | | | | | Change-Id: I7d7808d588470cbb2712cbda34a0c1bcc5730d11 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* | Add GStreamer libraries to openSUSE for QtWebKit and QtMultimediaKonstantin Tokarev2017-12-181-0/+4
| | | | | | | | | | Change-Id: Ia40bb35687bbe1ecb429c042d4acfa22599b69b8 Reviewed-by: Konstantin Tokarev <annulen@yandex.ru>
* | Update submodules on '5.10' in qt5Qt Submodule Update Bot2017-12-1614-0/+0
| | | | | | | | | | Change-Id: I8514e3e83b62ae4ddc527eb73bcfdcd138ac1875 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* | Remove Windows 8 provisioning scriptsTony Sarajärvi2017-12-152-2/+0
| | | | | | | | | | | | | | They are replaced by 8.1 scripts. Change-Id: Ib04c183b75cec2c6e529945f382c53fdeb23f213 Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
* | Add libxml2 and libxslt to openSUSE for QtWebKitKonstantin Tokarev2017-12-151-0/+4
| | | | | | | | | | Change-Id: Iafb89bf9c12cf1d38c2fe1944d55965319b85ea3 Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
* | Provisioning: Update default compiler to GCC-7 in openSUSE 42.3Tony Sarajärvi2017-12-141-3/+6
| | | | | | | | | | | | Task-number: QTQAINFRA-1258 Change-Id: Ia2683a23ecc55aae4e82f901f446d1cf46895269 Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
* | Swap ICC builds to use system's SQLite libraryTony Sarajärvi2017-12-142-1/+2
| | | | | | | | | | | | Task-number: QTBUG-64650 Change-Id: I2c692ae04f0cc02a5fecb12e3a7b905ee89b1af9 Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
* | Update submodules on '5.10' in qt5Qt Submodule Update Bot2017-12-1411-0/+0
| | | | | | | | | | Change-Id: I6c96508c89b6acab297d4f486b3b8966e28e4eee Reviewed-by: Liang Qi <liang.qi@qt.io>
* | Merge remote-tracking branch 'origin/5.9' into 5.10Liang Qi2017-12-1310-141/+8
|\| | | | | | | | | | | | | Conflicts: .gitmodules Change-Id: If22ccc401db60d550d6e6b474d54a05b363884af
| * Provisioning: Remove Android script from Red Hat 6.6Heikki Halmet2017-12-131-120/+0
| | | | | | | | | | | | | | Android linux builds are run by Red Hat 7.4 Change-Id: I8661b90494c1d43cc87e50136ed185fac93e4916 Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
| * Add 'ForceDebugInfo' -flag to linux desktop binariesJani Heikkinen2017-12-131-1/+1
| | | | | | | | | | | | | | | | Add 'ForceDebugInfo' for RHEL 7.4 as well Task-number: QTBUG-3934 Change-Id: I121c109f755c1b65bc0a59fc4edcb0a03f870d54 Reviewed-by: Akseli Salovaara <akseli.salovaara@qt.io>
| * Fix broken and duplicate Ruby provisioningJoni Jantti2017-12-138-20/+7
| | | | | | | | | | | | | | | | | | 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 <tony.sarajarvi@qt.io>
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-23 23:53:19 +0000