diff options
| author | Liang Qi <liang.qi@qt.io> | 2019-11-27 09:23:05 +0100 |
|---|---|---|
| committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2019-11-28 19:44:30 +0100 |
| commit | 63c515a6cbb002e96eea0134a77c380e5ef7b7c9 (patch) | |
| tree | 2322b3189c4ae04e1ac0c7fc21354e1fd59a8749 /coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64 | |
| parent | 3ba8bdeda0fd23bec9de10cb4cf962b50a535af6 (diff) | |
| parent | 0d6ae070f44236fdceda6241e9564dba93c91d0b (diff) | |
Merge remote-tracking branch 'origin/dev' into wip/cmake
Also update the Windows config to use MSVC2019 instead of 2017
to circumvent the issue that vcpkg is building libraries with the
latest compiler it finds (MSVC 2019), but Qt is building with 2017.
Conflicts:
coin/platform_configs/default.yaml
coin/platform_configs/qt5.yaml
coin/platform_configs/qtsaferenderer.yaml
Change-Id: I88deb114e171046b50fc617ab6bc18b707d61486
Diffstat (limited to 'coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64')
| -rwxr-xr-x | coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/02-apt.sh | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/02-apt.sh b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/02-apt.sh index 21dde7d7..38b4a100 100755 --- a/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/02-apt.sh +++ b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/02-apt.sh @@ -46,6 +46,10 @@ for service in apt-daily.timer apt-daily-upgrade.timer apt-daily.service apt-dai done function set_internal_repo { + + # Stop fetching the dep-11 metadata, since our mirrors do not handle them well + sudo mv /etc/apt/apt.conf.d/50appstream{,.disabled} + sudo tee "/etc/apt/sources.list" > /dev/null <<-EOC deb [arch=amd64] http://repo-clones.ci.qt.io/apt-mirror/mirror/ubuntu/ bionic main restricted universe multiverse deb [arch=amd64] http://repo-clones.ci.qt.io/apt-mirror/mirror/ubuntu/ bionic-updates main restricted universe multiverse |