Compare commits

...

3 Commits

Author SHA1 Message Date
Tero Heikkinen
f5f14e7b58 Temp quick fix for failing repo-clones in provisioning
Skip repo-clones.ci.qt.io with testserver where it should
use repo-clones-apt.ci.qt.io. Permament fix ongoing.

(related 13487118df)

Pick-to: 6.10 6.8 6.5
Task-number: QTQAINFRA-7632
Change-Id: I22bae5dfc96df82bb308233ec895f7164f4cc629
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2026-01-16 16:29:13 +00:00
Dimitrios Apostolou
5ee15a39c9 Enable sccache on macos-universal-on-arm64
Task-number: QTBUG-141785
Pick-to: 6.10 6.8
Change-Id: I63283fa327186226f6027c38a08bad1dfebdf2f2
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
(cherry picked from commit c16277f9d3)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2026-01-16 01:20:16 +00:00
Qt Submodule Update Bot
bed250f1eb Update submodules on '6.11 in qt/qt5'
Change-Id: I3429df221c6c601bc047a8772422facc13191c34
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2026-01-15 13:11:38 +00:00
48 changed files with 54 additions and 52 deletions

View File

@@ -12,7 +12,7 @@ Configurations:
Template: 'qtci-macos-15-arm-104'
Compiler: 'Clang'
Target arch: 'x86_64-arm64'
Features: ['Packaging', 'DoNotRunTests', 'WarningsAreErrors', 'UseConfigure', 'GenerateSBOM', 'VerifySBOM']
Features: ['Sccache', 'Packaging', 'DoNotRunTests', 'WarningsAreErrors', 'UseConfigure', 'GenerateSBOM', 'VerifySBOM']
Configure arguments: '-nomake examples -release -force-debug-info -separate-debug-info -headersclean -framework'
Environment variables: [
'CMAKE_ARGS=-DCMAKE_OSX_ARCHITECTURES="x86_64;arm64" -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_DIR}}',

View File

@@ -1,5 +1,6 @@
FROM ubuntu:16.04
ARG COIN_RUNS_IN_QT_COMPANY
RUN test x"$COIN_RUNS_IN_QT_COMPANY" = xtrue \
&& sed -i 's;\(archive\|security\)\.ubuntu\.com;repo-clones.ci.qt.io/apt-mirror/mirror;' /etc/apt/sources.list \
|| echo "Internal package repository not found. Using public repositories."
# Temp quick fix: Skip repo-clones usage
#RUN test x"$COIN_RUNS_IN_QT_COMPANY" = xtrue \
# && sed -i 's;\(archive\|security\)\.ubuntu\.com;repo-clones.ci.qt.io/apt-mirror/mirror;' /etc/apt/sources.list \
# || echo "Internal package repository not found. Using public repositories."

View File

@@ -1,5 +1,6 @@
FROM ubuntu:18.04
ARG COIN_RUNS_IN_QT_COMPANY
RUN test x"$COIN_RUNS_IN_QT_COMPANY" = xtrue \
&& sed -i 's;\(archive\|security\)\.ubuntu\.com;repo-clones.ci.qt.io/apt-mirror/mirror;' /etc/apt/sources.list \
|| echo "Internal package repository not found. Using public repositories."
# Temp quick fix: Skip repo-clones usage
#RUN test x"$COIN_RUNS_IN_QT_COMPANY" = xtrue \
# && sed -i 's;\(archive\|security\)\.ubuntu\.com;repo-clones.ci.qt.io/apt-mirror/mirror;' /etc/apt/sources.list \
# || echo "Internal package repository not found. Using public repositories."

2
qt3d

Submodule qt3d updated: 1c0551f6d5...e9b88c1db8

2
qtbase

Submodule qtbase updated: 0517640a84...0b55754835

2
qtcoap

Submodule qtcoap updated: f771dd93d4...6fa1cfb36e

2
qtdoc

Submodule qtdoc updated: 2671878407...ea6a01c869

2
qtgrpc

Submodule qtgrpc updated: 312ca964cc...945843ce22

2
qtmqtt

Submodule qtmqtt updated: 707e95855f...cd2412c397

Submodule qtopcua updated: 38be790f63...0c53e10c5a

Submodule qtscxml updated: 9e970ef91a...6a059a9be7

2
qtsvg

Submodule qtsvg updated: a11f440a39...eb93434311

Submodule qttools updated: 01daa2c7de...2a3b5c7499