Commit Graph

140 Commits

Author SHA1 Message Date
Oliver Wolff
0787472145 Add winrtrunner to common tools on Windows 10 machines
winrtrunner is needed for running auto tests on winrt. As the tool
resides in qttools and not qtbase and it not changed often, it was
decided to handle it similar to jom and see it as an external tool.

Change-Id: I9636962df51f98bef6aad3e340c565f50e393949
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2017-06-12 05:43:15 +00:00
Simon Hausmann
35057fe4b2 Clean up windows cleanup script
* 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>
2017-06-06 20:15:40 +00:00
Simon Hausmann
999b5f5dd7 Speed up Visual Studio update installation
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>
2017-06-06 20:15:31 +00:00
Dominik Holland
a5f3f8ed48 Install python3 on all platforms
Task-number: QTAUTO-345
Change-Id: If11ca425fa08cce8a518710ded0a6ec58159343d
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2017-05-11 10:29:12 +00:00
Liang Qi
41379a50c7 Merge remote-tracking branch 'origin/5.6' into 5.9.0
Conflicts:
	coin/platform_configs/default.txt
	coin/platform_configs/qt5.txt

Change-Id: Id82a13a6b2fe6db60c286e470396298c08e363b8
2017-05-08 08:35:30 +02:00
Heikki Halmet
a4a7f71f37 MSVC 2017 updated and missing component for winrt arm
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>
2017-05-03 09:51:17 +00:00
Liang Qi
285ee106e7 Merge remote-tracking branch 'origin/5.6' into 5.9
Conflicts:
	coin/platform_configs/default.txt
	coin/platform_configs/qt5.txt

This also fixes the 7Z extraction code to work on the windows 7 x86
installation where 7z is not in the PATH anymore with revision 2. The
fallback code was 64-bit only and needs the null check for ProgramFiles(x86)
along with the fall back to ProgramFiles to locate the 7z executable.

Change-Id: Ifcf014c3a99685c427a62898e1fa83910a4a7247
2017-04-03 12:06:27 +00:00
Heikki Halmet
e00cb3ac59 Provisioning: Bug fix patch for msvc 2015 update 3
This bug fix patch is needed for QtWebEngine

Change-Id: Id2c624461fbe27d9fd12a149281cae324bf8b14e
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2017-03-31 06:42:09 +00:00
Simo Fält
8b59bbc2a4 Coin provisioning: Use arg instead of autodetecting architecture
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>
2017-03-30 15:14:04 +00:00
Heikki Halmet
80b739b1e8 Provisioning: Move Visual Studio installation to pre-provisioning
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>
2017-03-22 09:31:06 +00:00
Liang Qi
848c4ac3f8 Merge remote-tracking branch 'origin/5.6' into 5.8
Change-Id: I0203dea8e441e58400d6c44697588a44b97a522b
2017-02-17 15:22:56 +01:00
Heikki Halmet
ad97fd589f Provisioning: Visual Studio 2015 with update 3
Common install script for Visual Studio installation and
updates. Latest Visual Studio 2015 update is required
for releases

Change-Id: I5b41625ca7f161b4ba2d417797f8839ef175cdbc
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2017-02-07 19:25:11 +00:00
Konstantin Tokarev
25160f24b6 Upgrade CMake to 3.6.2
QtWebKit requires CMake >= 2.8.12, while only 2.8.11 is available on
Windows 10 machines.

Task-number: QTQAINFRA-996
Change-Id: I734be4cc36f64dd5aeb243b0fbe4395c75c523b3
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
(cherry picked from commit 77eeee64a4)
2017-02-07 19:25:07 +00:00
Kari Oikarinen
321d5f1488 Provision libusb-1.0 for Windows
It's needed by tqtc-boot2qt/qdb.

Change-Id: Id5b8b18a2090c040c3eec1bd3c4c521456245381
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2017-01-31 18:33:44 +00:00
Simon Hausmann
0f4fdb9490 Merge remote-tracking branch 'origin/5.6' into 5.7
This change also includes an update of the CI platform configurations to
the values that were previously in the CI source tree for builds of the
5.7 branch.

This is done within the same change as the merge to preserve atomicity.

Task-number: QTQAINFRA-1074
Change-Id: Ie7bde30bd64d439cd17ea789102550ab9fb44194
2017-01-11 16:29:06 +01:00
Simon Hausmann
5f40fd649e Improve build performance on Windows
Disable the windows search indexing service, which has a tendency to start
indexing source code archives that we've just extracted. We are not interested
in this service.

Change-Id: I1d3f5178a035bc951499d993641a9315db9712ca
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@qt.io>
2017-01-09 13:37:16 +00:00
Simon Hausmann
15e1dc2054 Merge remote-tracking branch 'origin/5.6' into 5.7
Change-Id: I9def17eb03e1c08d1e44c8f90841b1bf5160d638
2017-01-06 20:35:52 +01:00
Simo Fält
167e4fc36f Provisioning: Disable Windows Defender
This will reduct the timeouts coin has had recently with win machines.

Change-Id: I32118f226194a3ea5e3c85d24103ec8341925d3c
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2017-01-06 12:15:36 +00:00
Konstantin Tokarev
678fcb4e66 Updated conan manifests after modification of packages
Change-Id: I60eee501254d41b438085b7b687af6aa2c085dba
Reviewed-by: Vitaliy Slobodin <vitaliy.slobodin@gmail.com>
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2016-12-24 07:32:20 +00:00
Konstantin Tokarev
7dc66c9528 Updated conan to 0.16.0
* Use --no-imports when installing packages, imports will be performed
on "make install" step with new "conan imports" command.
* Add txt generator to all conanfiles because it will be needed for
"conan imports".

Change-Id: Ie5e7ac6bfbf14dfa32ce82136b6be5e39476e393
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2016-11-30 15:31:52 +00:00
Konstantin Tokarev
1bf242603c Rename conan.ps1 and python.ps1 file in configuration dirs too
Order of files really matters in configuration directories, but I
renamed only main implementations in previous commit. Fixed that.

Change-Id: Ia541fa8fd36b3d52580ba9814e9f4c38aadce460
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2016-11-18 22:19:14 +00:00
Konstantin Tokarev
f8e075a679 Install conan from pip instead of exe
This allows us to get it working on 32-bit Windows.

Also renamed conan.ps1 and python.ps1 to get proper provisioning order.

Change-Id: I2f21db7dd0edbacb4e44024d1c70b315fba55801
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2016-11-16 21:25:32 +00:00
Konstantin Tokarev
19c10b941c Verify conan manifests when installing packages
This check allows us to ensure authenticity of installed files.

Manifests are sorted to minimize diffs in future updates.

Manifests lack trailing newline, because adding it would break manifest
parser of conan 0.15.0.

Task-number: QTQAINFRA-998
Change-Id: I6db75a78ce552da29d63cc4ac03726df326b7be2
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2016-11-16 21:25:21 +00:00
Konstantin Tokarev
93240adad1 Fixed conanfile options after packages were renamed
Change-Id: I4dbd3ec43bb6edfff7b9f98ac697cc7b70b09cda
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2016-11-16 21:25:15 +00:00
Konstantin Tokarev
05f4779eae Update package names and options in qtwebkit conanfiles
Task-number: QTQAINFRA-997
Change-Id: I19634c06041286fe44c787efe038d5ab24888b1f
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2016-11-07 11:59:03 +00:00
Konstantin Tokarev
cf257c2869 Pass compiler.runtime setting to conan
When MSVC is not autodected, necessary setting compiler.runtime has
undefined value, breaking installation of packages. This setting is not
supported by MinGW, so it should be optional.

Task-number: QTQAINFRA-998
Change-Id: Ia1a09eee14275314c160c7c45cd6ab276367dcdb
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2016-10-05 21:25:35 +00:00
Liang Qi
eb78767825 Merge remote-tracking branch 'origin/5.6' into 5.7
Conflicts:
	coin/provisioning/common/helpers.ps1

Change-Id: I9bf6180f7d2ee1ff1c7722eed3c21d416ba7410e
2016-10-04 11:10:59 +02:00
Heikki Halmet
c9d71e9eeb Python to provisioning for Windows
Installs Python version 2.7.10.
Python is required for building Qt 5 from source. More
specifically qtdeclarative and qtwebkit require it.

Change-Id: I63c8f3294a8a4799df5e52fbd41a36db8686950e
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2016-09-30 08:31:18 +00:00
Konstantin Tokarev
77eeee64a4 Upgrade CMake to 3.6.2
QtWebKit requires CMake >= 2.8.12, while only 2.8.11 is available on
Windows 10 machines.

Task-number: QTQAINFRA-996
Change-Id: I734be4cc36f64dd5aeb243b0fbe4395c75c523b3
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2016-09-30 07:20:41 +00:00
Konstantin Tokarev
23d1112839 Fixed value of CI_CONAN_BUILDINFO_DIR variable when provisioning Windows
Change-Id: I841783122edf82739826cc0a7672d8c809870e97
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2016-09-18 05:57:54 +00:00
Konstantin Tokarev
e1bfa77391 Do not use qmake and cmake generator automatically for each conanfile
Keep conanfiles self-contained. "txt" generator is not going to be used
by coin internally, drop it.

Task-number: QTQAINFRA-998
Change-Id: I80ffb7342e07d8ef883bed6de77ac9646479f145
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2016-09-17 11:06:44 +00:00
Konstantin Tokarev
fd6fe04cad Added cmake_installer, imports and explicit library types to conanfiles
Task-number: QTQAINFRA-997
Change-Id: I70b51a47c12928944d9f48be13332fce12296af1
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2016-09-17 11:06:40 +00:00
Konstantin Tokarev
0958cc4cca Changed BuildinfoDir of conan to use Coin-compatible compiler name
Task-number: QTQAINFRA-998
Change-Id: Ica31bf88055cb46eb9b6a0438ba5df461b6c8e5f
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2016-09-17 11:06:35 +00:00
Konstantin Tokarev
78a764ee65 Install conan dependencies if there is conanfile.txt for module
Change-Id: Ie331331f6383444c4329e7a57cb8a8b25e58bd2f
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2016-09-14 22:31:17 +00:00
Konstantin Tokarev
b6414f7d08 Added conanfiles for qtwebkit
Task-number: QTQAINFRA-997
Change-Id: I7aadf3549affeeeb3130d8fdb9ff15242a36aeb9
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2016-09-14 22:31:11 +00:00
Konstantin Tokarev
99ff42545f Install Conan on Win10
QtWebKit will use Conan to install 3rd party dependencies like ICU.

Task-number: QTQAINFRA-997
Change-Id: I4b9bfeb86b28abfdef52afcf249428c3ec41f32a
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2016-09-14 22:31:01 +00:00
Konstantin Tokarev
90f5a25c66 Update Ruby on Win10
QtWebKit requires newer Ruby than version installed on Windows 10 builders.

Task-number: QTQAINFRA-997
Change-Id: Id4f917a824daaab4aeb1445a3a16906663208b6d
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2016-09-14 22:30:52 +00:00
Frederik Gladhorn
0536b1e9e4 Clean up Windows provisioning scripts
The execution policy is set by the CI. The command usually fails as it
is in the scritps right now since it must be run as admin.

Change-Id: Ie31cb7fc15720cc6d76646bf475b3d60a02014d8
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@theqtcompany.com>
2016-06-16 10:15:18 +00:00
Jędrzej Nowacki
a97874523f Export CI_ICU_PATH variables on all windows templates
That is needed to change provisioning way in Coin, as currently it
depends on variables hard-coded in Coin agent.

Change-Id: I15068bec57dd9d67be05ef753d566b456fb8a2fc
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
2016-05-30 14:08:22 +00:00
Frederik Gladhorn
54f1bfd10c Add script to install jom through powershell
Change-Id: I3f12aa0dd54f99fafdffb53796e54e7b127c3c8c
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@theqtcompany.com>
2016-04-28 07:54:48 +00:00