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>
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>
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>
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>
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 ce47238ed9
but only noticed in the 5.9 branch.
Change-Id: Ib16072c0cc1c52f743f5500bc9732c8b04e962c7
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
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>
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>
* 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>
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>
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>
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>
* 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>
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>
* 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>
MSVC 2017 build tools are pre-provisioned to windows 10 templates
Change-Id: I98d857101ad209acd6eea9f821e367e514359d8c
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
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>
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>
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>
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>
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>
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>
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>
~/versions.txt will be used to storage sw version information
Change-Id: Ia84e0fc55f5bbcf4afd902ce601556defcc565a0
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
OpenGL32 update is needed for autotests to pass.
At least tst_qglbuffer vertexBuffer will fail without an update.
This update is already in place on Windows x86 and x64 CI hosts but
applied only to System32 -folders.
Change-Id: I223ffc53ecba77030385f29463c419acdc12e1a3
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
Install both x86 and x64 libraries in order to enable Windows x86
builds on Windows x64 hosts. Environment variables are used by Coin.
Change-Id: Ied654efb2f33ab1c643f38a1ea50a127aeb7af7e
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
Install both x86 and x64 libraries in order to enable Windows x86
builds on Windows x64 hosts. Environment variables are used by Coin.
Change-Id: Idada7fc41202298c6f1b2919f0f4343b717e890a
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
Install both x86 and x64 libraries in order to enable Windows x86
builds on Windows x64 hosts. Environment variables are used by Coin.
Change-Id: I8eea51a0bfd05bc72d1d004649211c7bc5901d97
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
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>
