Adjust submodule branches

Change-Id: I3f530f323406ebf62ef2673c8a7a3809fb92ce1e

.gitmodules

@@ -1,40 +1,40 @@
 [submodule "qtbase"]
 	path = qtbase
 	url = ../qtbase.git
-	branch = 6.10
+	branch = 6.10.3
 	status = essential
 [submodule "qtsvg"]
 	depends = qtbase
 	path = qtsvg
 	url = ../qtsvg.git
-	branch = 6.10
+	branch = 6.10.3
 	status = addon
 [submodule "qtdeclarative"]
 	depends = qtbase
 	recommends = qtimageformats qtshadertools qtsvg qtlanguageserver
 	path = qtdeclarative
 	url = ../qtdeclarative.git
-	branch = 6.10
+	branch = 6.10.3
 	status = essential
 [submodule "qtactiveqt"]
 	depends = qtbase
 	path = qtactiveqt
 	url = ../qtactiveqt.git
-	branch = 6.10
+	branch = 6.10.3
 	status = addon
 [submodule "qtmultimedia"]
 	depends = qtbase qtshadertools
 	recommends = qtdeclarative qtquick3d
 	path = qtmultimedia
 	url = ../qtmultimedia.git
-	branch = 6.10
+	branch = 6.10.3
 	status = addon
 [submodule "qttools"]
 	depends = qtbase
 	recommends = qtdeclarative qtactiveqt
 	path = qttools
 	url = ../qttools.git
-	branch = 6.10
+	branch = 6.10.3
 	status = essential
 [submodule "qtxmlpatterns"]
 	depends = qtbase
@@ -47,7 +47,7 @@
 	depends = qttools
 	path = qttranslations
 	url = ../qttranslations.git
-	branch = 6.10
+	branch = 6.10.3
 	status = essential
 	priority = 30
 [submodule "qtdoc"]
@@ -55,7 +55,7 @@
 	recommends = qtmultimedia qtshadertools qtwebengine
 	path = qtdoc
 	url = ../qtdoc.git
-	branch = 6.10
+	branch = 6.10.3
 	status = essential
 	priority = 40
 [submodule "qtrepotools"]
@@ -68,7 +68,7 @@
 	depends = qtbase
 	path = qtqa
 	url = ../qtqa.git
-	branch = 6.10
+	branch = 6.10.3
 	status = essential
 	priority = 50
 [submodule "qtlocation"]
@@ -76,21 +76,21 @@
 	recommends = qtdeclarative
 	path = qtlocation
 	url = ../qtlocation.git
-	branch = 6.10
+	branch = 6.10.3
 	status = preview
 [submodule "qtpositioning"]
 	depends = qtbase
 	recommends = qtdeclarative qtserialport
 	path = qtpositioning
 	url = ../qtpositioning.git
-	branch = 6.10
+	branch = 6.10.3
 	status = addon
 [submodule "qtsensors"]
 	depends = qtbase
 	recommends = qtdeclarative
 	path = qtsensors
 	url = ../qtsensors.git
-	branch = 6.10
+	branch = 6.10.3
 	status = addon
 [submodule "qtsystems"]
 	depends = qtbase
@@ -117,61 +117,61 @@
 	recommends = qtdeclarative
 	path = qtconnectivity
 	url = ../qtconnectivity.git
-	branch = 6.10
+	branch = 6.10.3
 	status = addon
 [submodule "qtwayland"]
 	depends = qtbase
 	recommends = qtdeclarative
 	path = qtwayland
 	url = ../qtwayland.git
-	branch = 6.10
+	branch = 6.10.3
 	status = addon
 [submodule "qt3d"]
 	depends = qtbase
 	recommends = qtdeclarative qtshadertools qtmultimedia
 	path = qt3d
 	url = ../qt3d.git
-	branch = 6.10
+	branch = 6.10.3
 	status = deprecated
 [submodule "qtimageformats"]
 	depends = qtbase
 	path = qtimageformats
 	url = ../qtimageformats.git
-	branch = 6.10
+	branch = 6.10.3
 	status = addon
 [submodule "qtserialbus"]
 	depends = qtbase
 	recommends = qtserialport
 	path = qtserialbus
 	url = ../qtserialbus.git
-	branch = 6.10
+	branch = 6.10.3
 	status = addon
 [submodule "qtserialport"]
 	depends = qtbase
 	path = qtserialport
 	url = ../qtserialport.git
-	branch = 6.10
+	branch = 6.10.3
 	status = addon
 [submodule "qtwebsockets"]
 	depends = qtbase
 	recommends = qtdeclarative
 	path = qtwebsockets
 	url = ../qtwebsockets.git
-	branch = 6.10
+	branch = 6.10.3
 	status = addon
 [submodule "qtwebchannel"]
 	depends = qtbase
 	recommends = qtdeclarative qtwebsockets
 	path = qtwebchannel
 	url = ../qtwebchannel.git
-	branch = 6.10
+	branch = 6.10.3
 	status = addon
 [submodule "qtwebengine"]
 	depends = qtdeclarative
 	recommends = qtwebchannel qttools qtpositioning
 	path = qtwebengine
 	url = ../qtwebengine.git
-	branch = 6.10
+	branch = 6.10.3
 	status = addon
 	priority = 10
 [submodule "qtcanvas3d"]
@@ -185,28 +185,28 @@
 	recommends = qtwebengine
 	path = qtwebview
 	url = ../qtwebview.git
-	branch = 6.10
+	branch = 6.10.3
 	status = addon
 [submodule "qtcharts"]
 	depends = qtbase
 	recommends = qtdeclarative qtmultimedia
 	path = qtcharts
 	url = ../qtcharts.git
-	branch = 6.10
+	branch = 6.10.3
 	status = deprecated
 [submodule "qtdatavis3d"]
 	depends = qtbase
 	recommends = qtdeclarative qtmultimedia
 	path = qtdatavis3d
 	url = ../qtdatavis3d.git
-	branch = 6.10
+	branch = 6.10.3
 	status = deprecated
 [submodule "qtvirtualkeyboard"]
 	depends = qtbase qtdeclarative qtsvg
 	recommends = qtmultimedia
 	path = qtvirtualkeyboard
 	url = ../qtvirtualkeyboard.git
-	branch = 6.10
+	branch = 6.10.3
 	status = addon
 [submodule "qtgamepad"]
 	depends = qtbase
@@ -219,27 +219,27 @@
 	depends = qtbase qtdeclarative
 	path = qtscxml
 	url = ../qtscxml.git
-	branch = 6.10
+	branch = 6.10.3
 	status = addon
 [submodule "qtspeech"]
 	depends = qtbase qtmultimedia
 	recommends = qtdeclarative
 	path = qtspeech
 	url = ../qtspeech.git
-	branch = 6.10
+	branch = 6.10.3
 	status = addon
 [submodule "qtnetworkauth"]
 	depends = qtbase
 	path = qtnetworkauth
 	url = ../qtnetworkauth.git
-	branch = 6.10
+	branch = 6.10.3
 	status = addon
 [submodule "qtremoteobjects"]
 	depends = qtbase
 	recommends = qtdeclarative
 	path = qtremoteobjects
 	url = ../qtremoteobjects.git
-	branch = 6.10
+	branch = 6.10.3
 	status = addon
 [submodule "qtwebglplugin"]
 	depends = qtbase qtwebsockets
@@ -252,88 +252,88 @@
 	depends = qtbase qtdeclarative
 	path = qtlottie
 	url = ../qtlottie.git
-	branch = 6.10
+	branch = 6.10.3
 	status = addon
 [submodule "qtquicktimeline"]
 	depends = qtbase qtdeclarative
 	path = qtquicktimeline
 	url = ../qtquicktimeline
-	branch = 6.10
+	branch = 6.10.3
 	status = addon
 [submodule "qtquick3d"]
 	depends = qtbase qtdeclarative qtshadertools
 	recommends = qtquicktimeline
 	path = qtquick3d
 	url = ../qtquick3d.git
-	branch = 6.10
+	branch = 6.10.3
 	status = addon
 [submodule "qtshadertools"]
 	depends = qtbase
 	path = qtshadertools
 	url = ../qtshadertools.git
-	branch = 6.10
+	branch = 6.10.3
 	status = addon
 [submodule "qt5compat"]
 	depends = qtbase qtdeclarative
 	path = qt5compat
 	url = ../qt5compat.git
-	branch = 6.10
+	branch = 6.10.3
 	status = deprecated
 [submodule "qtcoap"]
 	depends = qtbase
 	path = qtcoap
 	url = ../qtcoap.git
-	branch = 6.10
+	branch = 6.10.3
 	status = addon
 [submodule "qtmqtt"]
 	depends = qtbase qtdeclarative
 	recommends = qtwebsockets
 	path = qtmqtt
 	url = ../qtmqtt.git
-	branch = 6.10
+	branch = 6.10.3
 	status = addon
 [submodule "qtopcua"]
 	depends = qtbase qtdeclarative
 	path = qtopcua
 	url = ../qtopcua.git
-	branch = 6.10
+	branch = 6.10.3
 	status = addon
 [submodule "qtlanguageserver"]
 	depends = qtbase
 	path = qtlanguageserver
 	url = ../qtlanguageserver.git
-	branch = 6.10
+	branch = 6.10.3
 	status = preview
 [submodule "qthttpserver"]
 	depends = qtbase
 	recommends = qtwebsockets
 	path = qthttpserver
 	url = ../qthttpserver.git
-	branch = 6.10
+	branch = 6.10.3
 	status = addon
 [submodule "qtquick3dphysics"]
 	depends = qtbase qtdeclarative qtquick3d qtshadertools
 	path = qtquick3dphysics
 	url = ../qtquick3dphysics.git
-	branch = 6.10
+	branch = 6.10.3
 	status = addon
 [submodule "qtgrpc"]
 	depends = qtbase
 	recommends = qtdeclarative
 	path = qtgrpc
 	url = ../qtgrpc.git
-	branch = 6.10
+	branch = 6.10.3
 	status = addon
 [submodule "qtquickeffectmaker"]
 	depends = qtbase qtdeclarative qtshadertools
 	recommends = qtquick3d
 	path = qtquickeffectmaker
 	url = ../qtquickeffectmaker.git
-	branch = 6.10
+	branch = 6.10.3
 	status = addon
 [submodule "qtgraphs"]
 	depends = qtbase qtdeclarative qtquick3d
 	path = qtgraphs
 	url = ../qtgraphs.git
-	branch = 6.10
+	branch = 6.10.3
 	status = addon

cmake/QtIRCommandLineHelpers.cmake

@@ -178,7 +178,6 @@ function(qt_ir_command_line_set_input name val)
 endfunction()
 
 # Appends a value of a command line option into a global property.
-# Currently unused
 function(qt_ir_command_line_append_input name val)
     if(NOT "${commandline_option_${name}_alias}" STREQUAL "")
         set(name "${commandline_option_${name}_alias}")
@@ -240,6 +239,22 @@ function(qt_ir_commandline_string arg val nextok)
     endif()
 endfunction()
 
+# Like string, but appends to the existing value instead of overwriting.
+# Allows repeated flags like: -skip qtwebengine -skip qtwebview
+function(qt_ir_commandline_addString arg val nextok)
+    if(nextok)
+        qt_ir_args_get_next_command_line_arg(val)
+
+        if("${val}" MATCHES "^-")
+            qt_ir_add_error("No value supplied to command line options '${arg}'.")
+        endif()
+    endif()
+    qt_ir_validate_value("${arg}" "${val}" success)
+    if(success)
+        qt_ir_command_line_append_input("${arg}" "${val}")
+    endif()
+endfunction()
+
 # Sets / handles the value of a command line void option.
 # This is an option like --force, which doesn't take any arguments.
 # Currently unused
@@ -279,6 +294,7 @@ endfunction()
 #
 # Currently handles the following types of CLI arguments:
 #  string
+#  addString (like string, but accumulates values from repeated flags)
 #  boolean
 #  void
 #

cmake/QtIRHelpers.cmake

@@ -89,6 +89,26 @@ function(qt_ir_handle_called_from_configure top_level_src_path out_var_exit_reas
 
     qt_ir_validate_options_for_configure()
 
+    # Convert -skip values to module-subset exclusions so init-repository respects them.
+    qt_ir_get_option_value(skip skip_modules)
+    if(skip_modules)
+        string(REPLACE "," ";" skip_modules "${skip_modules}")
+        list(TRANSFORM skip_modules STRIP)
+        list(TRANSFORM skip_modules PREPEND "-")
+
+        qt_ir_get_option_value(module-subset existing_subset)
+        if(NOT existing_subset)
+            set(existing_subset "default")
+        endif()
+
+        list(APPEND skip_modules "${existing_subset}")
+        list(REMOVE_DUPLICATES skip_modules)
+        list(JOIN skip_modules "," merged_subset)
+
+        qt_ir_set_option_value(module-subset "${merged_subset}")
+        message(DEBUG "Preprocessed -skip option: module-subset is now: ${merged_subset}")
+    endif()
+
     # -init_submodules implies --force
     qt_ir_set_option_value(force TRUE)
 
@@ -110,6 +130,11 @@ function(qt_ir_get_args_from_optfile_configure_filtered optfile_path out_var)
     set(extra_configure_args "")
     set(extra_cmake_args "")
 
+    # Collect modules to skip. These may come from:
+    # 1. The -skip option (consumed by init-repository's option parser)
+    # 2. Exclusion entries in -submodules/--module-subset (e.g. -qtfoo)
+    qt_ir_get_option_value(skip skip_modules)
+
     # If the -submodules or --module-subset options were specified, transform
     # the values into something configure understands and pass them to configure.
     qt_ir_get_option_value(module-subset submodules)
@@ -133,25 +158,10 @@ function(qt_ir_get_args_from_optfile_configure_filtered optfile_path out_var)
         endif()
 
         list(JOIN include_submodules "," include_submodules)
-        list(JOIN exclude_submodules "," exclude_submodules)
 
-        # Handle case when the -skip argument is already passed.
-        # In that case read the passed values, merge with new ones,
-        # remove both the -skip and its values, and re-add it later.
-        list(FIND filtered_args "-skip" skip_index)
-        if(exclude_submodules AND skip_index GREATER -1)
-            list(LENGTH filtered_args filtered_args_length)
-            math(EXPR skip_args_index "${skip_index} + 1")
-
-            if(skip_args_index LESS filtered_args_length)
-                list(GET filtered_args "${skip_args_index}" skip_args)
-                string(REPLACE "," ";" skip_args "${skip_args}")
-                list(APPEND skip_args ${exclude_submodules})
-                list(REMOVE_DUPLICATES skip_args)
-                list(JOIN skip_args "," exclude_submodules)
-                list(REMOVE_AT filtered_args "${skip_args_index}")
-                list(REMOVE_AT filtered_args "${skip_index}")
-            endif()
+        # Merge exclusions from module-subset into the skip list.
+        if(exclude_submodules)
+            list(APPEND skip_modules ${exclude_submodules})
         endif()
 
         # Handle case when only '-submodules existing' is passed and the
@@ -159,9 +169,13 @@ function(qt_ir_get_args_from_optfile_configure_filtered optfile_path out_var)
         if(include_submodules)
             list(APPEND extra_configure_args "-submodules" "${include_submodules}")
         endif()
-        if(exclude_submodules)
-            list(APPEND extra_configure_args "-skip" "${exclude_submodules}")
-        endif()
+    endif()
+
+    # Forward all collected skip modules to configure.
+    if(skip_modules)
+        list(REMOVE_DUPLICATES skip_modules)
+        list(JOIN skip_modules "," skip_csv)
+        list(APPEND extra_configure_args "-skip" "${skip_csv}")
     endif()
 
     # Insert the extra arguments into the proper positions before and after '--'.

cmake/QtIROptionsHelpers.cmake

@@ -37,6 +37,7 @@ macro(qt_ir_set_known_command_line_options)
     qt_ir_commandline_option(init-submodules TYPE boolean)
     # We alias qtbase's submodules option to init-repository module-subset.
     qt_ir_commandline_option(submodules ALIAS module-subset TYPE string)
+    qt_ir_commandline_option(skip TYPE addString)
 
     set_property(GLOBAL PROPERTY _qt_ir_known_command_line_options "${commandline_known_options}")
 endmacro()

coin/platform_configs/cmake_platforms.yaml

@@ -110,15 +110,15 @@ Configurations:
 # Test on Ubuntu 24.04 x64 X11
 -
     Id: 'ubuntu-24.04-x64-developer-build-x11-tests'
-    Template: 'qtci-linux-Ubuntu-24.04-x86_64-51'
+    Template: 'qtci-linux-Ubuntu-24.04-x86_64-54'
     Compiler: 'GCC'
-    Features: ['Sccache', 'TestOnly', 'InsignificantTests']
+    Features: ['Sccache', 'TestOnly']
     Platform dependency: 'ubuntu-24.04-x64-developer-build'
 -
     Id: 'ubuntu-24.04-x64-x11-tests'
-    Template: 'qtci-linux-Ubuntu-24.04-x86_64-51'
+    Template: 'qtci-linux-Ubuntu-24.04-x86_64-54'
     Compiler: 'GCC'
-    Features: ['Sccache', 'TestOnly', 'InsignificantTests']
+    Features: ['Sccache', 'TestOnly']
     Platform dependency: 'ubuntu-24.04-x64'
 -
     Id: 'opensuse-15.6-developer-build'
@@ -167,23 +167,11 @@ Configurations:
         'Protobuf_ROOT={{.Env.Protobuf_ROOT_msvc}}',
         'WEBVIEW2_SDK_ROOT={{.Env.WEBVIEW2_SDK_ROOT_PATH}}',
     ]
--
-    Id: 'windows-11_22h2-arm64-msvc2022'
-    Template: 'qtci-windows-11_22H2-aarch64-55'
-    Compiler: 'MSVC2022'
-    Features: ['Packaging', 'DebugAndRelease', 'UseConfigure', 'GenerateSBOM', 'VerifySBOM']
-    Configure arguments: '-debug-and-release -force-debug-info -headersclean -nomake examples -qt-zlib -no-opengl -no-sql-db2 -no-sql-ibase -no-sql-mysql -no-sql-oci -no-sql-psql -no-sql-mimer'
-    Environment variables: [
-        'CMAKE_ARGS=-DFEATURE_msvc_obj_debug_info=ON -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_arm64}}\..',
-        'NON_QTBASE_CMAKE_ARGS= -DFEATURE_clangcpp=OFF -DFFMPEG_DIR={{.Env.FFMPEG_DIR_MSVC_ARM64}} -DQT_DEPLOY_FFMPEG=TRUE',
-        'Protobuf_ROOT={{.Env.Protobuf_ROOT_msvc}}',
-        'WEBVIEW2_SDK_ROOT={{.Env.WEBVIEW2_SDK_ROOT_PATH}}',
-    ]
 -
     Id: 'windows-11_23h2-arm64-msvc2022'
     Template: 'qtci-windows-11_23H2-aarch64-53'
     Compiler: 'MSVC2022'
-    Features: ['Packaging', 'DebugAndRelease', 'UseConfigure', 'GenerateSBOM', 'VerifySBOM']
+    Features: ['Sccache', 'Packaging', 'DebugAndRelease', 'UseConfigure', 'GenerateSBOM', 'VerifySBOM']
     Configure arguments: '-debug-and-release -force-debug-info -headersclean -nomake examples -qt-zlib -no-sql-db2 -no-sql-ibase -no-sql-mysql -no-sql-oci -no-sql-psql -no-sql-mimer'
     Environment variables: [
         'CMAKE_ARGS=-DFEATURE_msvc_obj_debug_info=ON -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_arm64}}\..',
@@ -207,8 +195,6 @@ Configurations:
         'OPENSSL_INCLUDE_x64={{.Env.OPENSSL_INCLUDE_x64_arm64}}',
         'OPENSSL_LIB_x64={{.Env.OPENSSL_LIB_x64_arm64}}',
         'LLVM_INSTALL_DIR={{.Env.LLVM_INSTALL_DIR_msvc_arm64}}',
-        'VCPKG_HOST_TRIPLET=x64-windows-qt',
-        'VCPKG_TARGET_TRIPLET=arm64-windows-qt',
         'Protobuf_ROOT={{.Env.Protobuf_ROOT_msvc}}',
         'WEBVIEW2_SDK_ROOT={{.Env.WEBVIEW2_SDK_ROOT_PATH}}',
     ]
@@ -251,6 +237,16 @@ Configurations:
         'CMAKE_ARGS=-DOpenGL_GL_PREFERENCE=LEGACY',
         'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR}} -DQT_DEPLOY_FFMPEG=TRUE -DINPUT_headersclean=ON'
     ]
+-
+    Id: 'rhel-9.6'
+    Template: 'qtci-linux-RHEL-9.6-x86_64-51'
+    Compiler: 'GCC'
+    Features: ['Sccache', 'UseConfigure', 'InstallQt5Dependencies', 'GenerateSBOM', 'VerifySBOM', 'InsignificantTests', 'DoNotAbortTestingOnFirstFailure']
+    Configure arguments: '-nomake examples -release -force-debug-info -headersclean -separate-debug-info -qt-libjpeg -qt-libpng -qt-pcre -qt-harfbuzz -qt-doubleconversion -no-libudev -bundled-xcb-xinput'
+    Environment variables: [
+        'CMAKE_ARGS=-DOpenGL_GL_PREFERENCE=LEGACY',
+        'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR}} -DQT_DEPLOY_FFMPEG=TRUE -DINPUT_headersclean=ON'
+    ]
 -
     Id: 'ios-universal'
     Template: 'qtci-macos-14-arm-106'

coin/platform_configs/cmake_platforms_static_release.yaml

@@ -13,28 +13,15 @@ Configurations:
         'LLVM_INSTALL_DIR={{.Env.LLVM_INSTALL_DIR_msvc}}',
         'Protobuf_ROOT={{.Env.Protobuf_ROOT_msvc}}',
     ]
--
-    Id: 'windows-11_22h2-arm64-msvc2022-minimal-static-test'
-    Template: 'qtci-windows-11_22H2-aarch64-55'
-    Compiler: 'MSVC2022'
-    Features: ['UseConfigure', 'InsignificantTests', 'Packaging', 'MinimalStaticTests']
-    Configure arguments: '-static -release -headersclean -nomake examples -qt-libjpeg -no-icu -qt-doubleconversion -qt-zlib -c++std c++17 -no-sql-psql'
-    Environment variables: [
-        'CMAKE_ARGS=-DFEATURE_msvc_obj_debug_info=ON -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_arm64}}\..',
-        'NON_QTBASE_CMAKE_ARGS=-DCMAKE_BUILD_TYPE=Release -DFEATURE_native_grpc=OFF -DFEATURE_clangcpp=OFF -DFEATURE_qdoc=OFF',
-        'Protobuf_ROOT={{.Env.Protobuf_ROOT_msvc}}',
-    ]
 -
     Id: 'windows-11_23h2-arm64-msvc2022-minimal-static-test'
     Template: 'qtci-windows-11_23H2-aarch64-53'
     Compiler: 'MSVC2022'
-    Features: ['UseConfigure', 'InsignificantTests', 'Packaging', 'MinimalStaticTests']
+    Features: ['Sccache', 'UseConfigure', 'InsignificantTests', 'Packaging', 'MinimalStaticTests']
     Configure arguments: '-static -release -headersclean -nomake examples -qt-libjpeg -no-icu -qt-doubleconversion -qt-zlib -c++std c++17 -no-sql-psql'
     Environment variables: [
         'CMAKE_ARGS=-DFEATURE_msvc_obj_debug_info=ON -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_arm64}}\..',
         'NON_QTBASE_CMAKE_ARGS=-DCMAKE_BUILD_TYPE=Release -DFEATURE_native_grpc=OFF -DFEATURE_clangcpp=OFF -DFEATURE_qdoc=OFF',
-        'VCPKG_HOST_TRIPLET=arm64-windows-qt',
-        'VCPKG_TARGET_TRIPLET=arm64-windows-qt',
         'Protobuf_ROOT={{.Env.Protobuf_ROOT_msvc}}',
     ]
 -
@@ -51,7 +38,7 @@ Configurations:
     Id: 'ubuntu-24.04-arm64'
     Template: 'qtci-linux-Ubuntu-24.04-aarch64-52'
     Compiler: 'GCC'
-    Features: ['Packaging', 'UseConfigure', 'InstallQt5Dependencies', 'DoNotRunTests']
+    Features: ['Sccache', 'Packaging', 'UseConfigure', 'InstallQt5Dependencies', 'DoNotRunTests']
     Configure arguments: '-static -nomake examples -release -qt-libjpeg -qt-libpng -qt-pcre -qt-harfbuzz -no-libudev -bundled-xcb-xinput -no-icu -qt-doubleconversion'
     Environment variables: [
         'CMAKE_ARGS=-DOpenGL_GL_PREFERENCE=LEGACY',

coin/platform_configs/cmake_platforms_target_android.yaml

@@ -47,6 +47,22 @@ Configurations:
         'ANDROID_NDK_ROOT={{.Env.ANDROID_NDK_ROOT_LATEST}}',
         'ANDROID_EMULATOR=emulator_x86_api_28'
     ]
+-
+    Id: 'android-9-x86-on-linux-rhel_9_6'
+    Template: 'qtci-linux-RHEL-9.6-x86_64-51'
+    Target os: 'Android_ANY'
+    Target arch: 'x86'
+    Compiler: 'GCC'
+    Target compiler: 'Clang'
+    Platform dependency: 'rhel-9.6'
+    Features: ['Sccache', 'WarningsAreErrors', 'AndroidTestRun', 'VMSize8', 'UseConfigure', 'GenerateSBOM', 'VerifySBOM', 'InsignificantTests', 'DoNotAbortTestingOnFirstFailure']
+    Environment variables: [
+        'TARGET_CONFIGURE_ARGS=-nomake examples -release -force-debug-info -android-ndk {{.Env.ANDROID_NDK_ROOT_LATEST}} -android-sdk {{.Env.ANDROID_SDK_ROOT}} -android-abis x86',
+        'TARGET_CMAKE_ARGS=-DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ANDROID_HOME_LATEST}} -DQT_GENERATE_WRAPPER_SCRIPTS_FOR_ALL_HOSTS=ON',
+        'NON_QTBASE_TARGET_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR_ANDROID_X86_NDK_LATEST}} -DQT_DEPLOY_FFMPEG=TRUE -DQT_PROTOBUF_WELL_KNOWN_TYPES_PROTO_DIR=/usr/local/include',
+        'ANDROID_NDK_ROOT={{.Env.ANDROID_NDK_ROOT_LATEST}}',
+        'ANDROID_EMULATOR=emulator_x86_api_28'
+    ]
 -
     Id: 'android-16-x86_64-on-linux'
     Template: 'qtci-linux-RHEL-9.4-x86_64-50'
@@ -63,3 +79,19 @@ Configurations:
         'ANDROID_NDK_ROOT={{.Env.ANDROID_NDK_ROOT_LATEST}}',
         'ANDROID_EMULATOR=emulator_x86_64_api_36'
     ]
+-
+    Id: 'android-16-x86_64-on-linux-rhel_9_6'
+    Template: 'qtci-linux-RHEL-9.6-x86_64-51'
+    Target os: 'Android_ANY'
+    Target arch: 'x86_64'
+    Compiler: 'GCC'
+    Target compiler: 'Clang'
+    Platform dependency: 'rhel-9.6'
+    Features: ['Sccache', 'WarningsAreErrors', 'AndroidTestRun', 'VMSize8', 'UseConfigure', 'GenerateSBOM', 'VerifySBOM', 'InsignificantTests', 'DoNotAbortTestingOnFirstFailure']
+    Environment variables: [
+        'TARGET_CONFIGURE_ARGS=-nomake examples -release -force-debug-info -android-ndk {{.Env.ANDROID_NDK_ROOT_LATEST}} -android-sdk {{.Env.ANDROID_SDK_ROOT}} -android-abis x86_64',
+        'TARGET_CMAKE_ARGS=-DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ANDROID_HOME_LATEST}} -DQT_GENERATE_WRAPPER_SCRIPTS_FOR_ALL_HOSTS=ON',
+        'NON_QTBASE_TARGET_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR_ANDROID_X86_64_NDK_LATEST}} -DQT_DEPLOY_FFMPEG=TRUE -DQT_PROTOBUF_WELL_KNOWN_TYPES_PROTO_DIR=/usr/local/include',
+        'ANDROID_NDK_ROOT={{.Env.ANDROID_NDK_ROOT_LATEST}}',
+        'ANDROID_EMULATOR=emulator_x86_64_api_36'
+    ]

coin/platform_configs/linux_android_tests_developer.yaml

@@ -15,3 +15,18 @@ Configurations:
         'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR_ANDROID}}',
         'NON_QTBASE_TARGET_CMAKE_ARGS=',
         'ANDROID_EMULATOR=emulator_x86_api_28']
+-
+    Id: 'android-x86-developer-build-testrun-on-linux-rhel_9_6'
+    Template: 'qtci-linux-RHEL-9.6-x86_64-51'
+    Target os: 'Android_ANY'
+    Target arch: 'x86'
+    Compiler: 'GCC'
+    Target compiler: 'Clang'
+    Platform dependency: 'rhel-9.6'
+    Features: ['Sccache', 'AndroidTestRun', 'UseConfigure', 'InsignificantTests', 'DoNotAbortTestingOnFirstFailure']
+    Environment variables: [
+        'TARGET_CONFIGURE_ARGS=-nomake examples -debug -developer-build -android-ndk {{.Env.ANDROID_NDK_ROOT_LATEST}} -android-sdk {{.Env.ANDROID_SDK_ROOT}} -android-abis x86',
+        'TARGET_CMAKE_ARGS=-DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ANDROID_HOME_LATEST}}',
+        'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR_ANDROID}}',
+        'NON_QTBASE_TARGET_CMAKE_ARGS=',
+        'ANDROID_EMULATOR=emulator_x86_api_28']

coin/platform_configs/linux_android_tests_multi_abi.yaml

@@ -26,3 +26,31 @@ Configurations:
         'COMMON_TARGET_TEST_CMAKE_ARGS=-DQT_ANDROID_ABIS="x86;x86_64"',
         'ANDROID_EMULATOR=emulator_x86_api_28'
     ]
+-
+    Id: 'android-9-multi-abi-rhel_9_6'
+    Template: 'qtci-linux-RHEL-9.6-x86_64-51'
+    Target os: 'Android_ANY'
+    Target arch: 'multi'
+    Compiler: 'GCC'
+    Target compiler: 'Clang'
+    Platform dependency: [
+        'rhel-9.6',
+        'android-9-x86-on-linux',
+        'android-16-x86_64-on-linux'
+    ]
+    Features: [
+        'Sccache',
+        'WarningsAreErrors',
+        'AndroidTestRun',
+        'MinimalAndroidMultiABITests',
+        'InstallDepsPerPlatformSubdir',
+        'InsignificantTests',
+        'DoNotAbortTestingOnFirstFailure'
+    ]
+    Environment variables: [
+        'QT_CI_ARTIFACT_ID_PATH_Android-host=QT_CI_ARTIFACT_ID_PATH_rhel-9.6',
+        'QT_CI_ARTIFACT_ID_PATH_Android-x86=QT_CI_ARTIFACT_ID_PATH_android-9-x86-on-linux',
+        'QT_CI_ARTIFACT_ID_PATH_Android-x86_64=QT_CI_ARTIFACT_ID_PATH_android-16-x86_64-on-linux',
+        'COMMON_TARGET_TEST_CMAKE_ARGS=-DQT_ANDROID_ABIS="x86;x86_64"',
+        'ANDROID_EMULATOR=emulator_x86_api_28'
+    ]

coin/platform_configs/macos.yaml

@@ -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}}',
@@ -48,19 +48,19 @@ Configurations:
         Id: 'macos-13-arm64-tests'
         Template: 'qtci-macos-13-arm-107'
         Compiler: 'Clang'
-        Features: ['TestOnly', 'Packaging']
+        Features: ['Sccache', 'TestOnly', 'Packaging']
         Platform dependency: 'macos-universal-on-arm64'
     -
         Id: 'macos-14-arm64-tests'
         Template: 'qtci-macos-14-arm-106'
         Compiler: 'Clang'
-        Features: ['TestOnly', 'Packaging']
+        Features: ['Sccache', 'TestOnly', 'Packaging']
         Platform dependency: 'macos-universal-on-arm64'
     -
         Id: 'macos-15-arm64-tests'
         Template: 'qtci-macos-15-arm-104'
         Compiler: 'Clang'
-        Features: ['TestOnly', 'Packaging']
+        Features: ['Sccache', 'TestOnly', 'Packaging']
         Platform dependency: 'macos-universal-on-arm64'
 
     # =========================================================================
@@ -83,7 +83,7 @@ Configurations:
         Id: 'macos-arm64-developer-build'
         Template: 'qtci-macos-15-arm-104'
         Compiler: 'Clang'
-        Features: ['DoNotRunTests', 'WarningsAreErrors', 'UseConfigure']
+        Features: ['Sccache', 'DoNotRunTests', 'WarningsAreErrors', 'UseConfigure']
         Configure arguments: '-developer-build -nomake examples -debug -framework'
         Environment variables: [
             'CMAKE_ARGS=-DOPENSSL_ROOT_DIR={{.Env.OPENSSL_DIR}}',

coin/platform_configs/nightly_examples_and_tests.yaml

@@ -2,7 +2,7 @@ Version: 2
 Configurations:
 -
     Id: 'ubuntu-24.04-x64-examples-and-tests-build'
-    Template: 'qtci-linux-Ubuntu-24.04-x86_64-51'
+    Template: 'qtci-linux-Ubuntu-24.04-x86_64-54'
     Compiler: 'GCC'
     Features: ['Sccache', 'UseConfigure', 'DoNotRunTests', 'NoSubmoduleDependencies']
     Configure arguments: '-make examples -make tests'

coin/platform_configs/nightly_top_level_run_cmake_tests.yaml

@@ -2,7 +2,7 @@ Version: 2
 Configurations:
 -
     Id: 'ubuntu-24.04-x64-run-cmake-tests'
-    Template: 'qtci-linux-Ubuntu-24.04-x86_64-51'
+    Template: 'qtci-linux-Ubuntu-24.04-x86_64-54'
     Compiler: 'GCC'
     Features: ['Sccache', 'NoSubmoduleDependencies', 'TopLevelRunCMakeTests', 'DisableTests', 'VMSize16']
     Configure arguments: ''

coin/platform_configs/qmake2cmake.yaml

@@ -13,6 +13,10 @@ Configurations:
     Template: 'qtci-linux-RHEL-9.4-x86_64-50'
     Compiler: 'GCC'
     Features: ['DisableTests']
+-
+    Template: 'qtci-linux-RHEL-9.6-x86_64-51'
+    Compiler: 'GCC'
+    Features: ['DisableTests']
 -
     Template: 'qtci-linux-Ubuntu-22.04-x86_64-51'
     Compiler: 'GCC'

coin/platform_configs/qtgradleplugin.yaml

@@ -6,6 +6,11 @@ Configurations:
     Template: 'qtci-linux-RHEL-9.4-x86_64-50'
     Compiler: 'GCC'
     Features: ['TestOnly']
+-
+    Id: 'qtgp-on-linux-rhel_9_6'
+    Template: 'qtci-linux-RHEL-9.6-x86_64-51'
+    Compiler: 'GCC'
+    Features: ['TestOnly', 'InsignificantTests', 'DoNotAbortTestingOnFirstFailure']
 -
     Id: 'qtgp-on-macos'
     Template: 'qtci-macos-14-arm-106'

coin/platform_configs/qtlite.yaml

@@ -2,7 +2,7 @@ Version: 2
 Configurations:
 -
     Id: 'ubuntu-24.04-x86-static-qtlite'
-    Template: 'qtci-linux-Ubuntu-24.04-x86_64-51'
+    Template: 'qtci-linux-Ubuntu-24.04-x86_64-54'
     Compiler: 'GCC'
     Features: ['Sccache', 'UseConfigure', 'DoNotRunTests', 'MinimalStaticTests']
     Configure arguments: >
@@ -224,7 +224,7 @@ Configurations:
     ]
 -
     Id: 'ubuntu-24.04-x86-static-qtlite-tests'
-    Template: 'qtci-linux-Ubuntu-24.04-x86_64-51'
+    Template: 'qtci-linux-Ubuntu-24.04-x86_64-54'
     Compiler: 'GCC'
     Features: ['Sccache', 'TestOnly','InsignificantTests']
     Platform dependency: 'ubuntu-24.04-x86-static-qtlite'

coin/platform_configs/quick-bridges.yaml

@@ -25,7 +25,7 @@ Configurations:
     Environment variables: []
 -
     Id: 'linux-quick-bridges'
-    Template: 'qtci-linux-Ubuntu-24.04-x86_64-51'
+    Template: 'qtci-linux-Ubuntu-24.04-x86_64-54'
     Compiler: 'GCC'
     Features: ['Packaging', 'Sccache', 'UseConfigure', 'DisableTests', 'Insignificant']
     Configure arguments: >

coin/platform_configs/tqtc-android-automotive.yaml

@@ -3,6 +3,7 @@ Include: [
     cmake_platforms.yaml: [
         "documentation-warnings",
         "rhel-9.4",
+        "rhel-9.6",
         'windows-11_24h2-mingw13',
     ],
     macos.yaml: [
@@ -49,3 +50,35 @@ Configurations:
         'NON_QTBASE_TARGET_CMAKE_ARGS= -DQT_PROTOBUF_WELL_KNOWN_TYPES_PROTO_DIR=/usr/local/include',
         'ANDROID_EMULATOR=automotive_emulator_x86_64_api_29'
     ]
+-
+    Id: "automotive-android-14-x86_64-on-linux-rhel_9_6"
+    Template: 'qtci-linux-RHEL-9.6-x86_64-51'
+    Target os: 'Android_ANY'
+    Target arch: 'x86_64'
+    Compiler: 'GCC'
+    Target compiler: 'Clang'
+    Platform dependency: 'rhel-9.6'
+    Features: ['Sccache', 'WarningsAreErrors', 'AndroidTestRun', 'VMSize8', 'UseConfigure', 'InsignificantTests', 'DoNotAbortTestingOnFirstFailure']
+    Environment variables: [
+        'TARGET_CONFIGURE_ARGS=-nomake examples -release -force-debug-info -android-ndk {{.Env.ANDROID_NDK_ROOT_LATEST}} -android-sdk {{.Env.ANDROID_SDK_ROOT}} -android-abis x86_64',
+        'TARGET_CMAKE_ARGS=-DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ANDROID_HOME_LATEST}}',
+        'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR_ANDROID}}',
+        'NON_QTBASE_TARGET_CMAKE_ARGS= -DQT_PROTOBUF_WELL_KNOWN_TYPES_PROTO_DIR=/usr/local/include',
+        'ANDROID_EMULATOR=automotive_emulator_x86_64_api_34'
+    ]
+-
+    Id: "automotive-android-10-x86_64-on-linux-rhel_9_6"
+    Template: 'qtci-linux-RHEL-9.6-x86_64-51'
+    Target os: 'Android_ANY'
+    Target arch: 'x86_64'
+    Compiler: 'GCC'
+    Target compiler: 'Clang'
+    Platform dependency: 'rhel-9.6'
+    Features: ['Sccache', 'WarningsAreErrors', 'AndroidTestRun', 'VMSize8', 'UseConfigure', 'InsignificantTests', 'DoNotAbortTestingOnFirstFailure']
+    Environment variables: [
+        'TARGET_CONFIGURE_ARGS=-nomake examples -release -force-debug-info -android-ndk {{.Env.ANDROID_NDK_ROOT_LATEST}} -android-sdk {{.Env.ANDROID_SDK_ROOT}} -android-abis x86_64',
+        'TARGET_CMAKE_ARGS=-DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ANDROID_HOME_LATEST}}',
+        'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR_ANDROID}}',
+        'NON_QTBASE_TARGET_CMAKE_ARGS= -DQT_PROTOBUF_WELL_KNOWN_TYPES_PROTO_DIR=/usr/local/include',
+        'ANDROID_EMULATOR=automotive_emulator_x86_64_api_29'
+    ]

coin/pre-provisioning/qtci-linux-RHEL-9.6-x86_64/01-disable-automounting.sh

@@ -0,0 +1,13 @@
+#!/usr/bin/env bash
+# Copyright (C) 2023 The Qt Company Ltd.
+# SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
+
+set -ex
+
+sudo tee -a /etc/dconf/db/local.d/00-media-automount <<"EOF"
+[org/gnome/desktop/media-handling]
+automount=false
+automount-open=false
+EOF
+
+sudo dconf update

coin/pre-provisioning/qtci-linux-RHEL-9.6-x86_64/README_MANUAL_INSTALLATIONS

@@ -0,0 +1,64 @@
+### RHEL 9.6 ###
+
+Language: English (United States)
+
+# Installation Summary #
+
+Keyboard: English (US), Norwegian (Windows), Finnish (Windows)
+Language Support: English (United States)
+Time & Date: Etc/Coordinated Universal Time
+
+Connect to Red Hat: Registered
+Installation Source: Local media
+Software Selection: Server with GUI
+
+Installation Destination: Automatic partitioning selected
+KDUMP enabled: Memory Reservation: automatic
+Network & Host Name: Connected
+Security Profile: No profile selected
+
+Root Password: set
+User Creation: set. Make this user administrator. Require password.
+
+# Configure Settings
+ Notifications:
+    * Lock Screen Notifications: OFF
+    * Applications: Set notification off
+    * Do Not Disturb: on
+ Applications:
+    * Disable notifications from all applications
+ Privacy:
+    * Blank Screen Delay: Never
+    * Screen Lock: OFF
+ Power:
+    * Blank screen: Never
+ Displays:
+    * Resolution: 1280 x 800
+ Users:
+    * Automatic login on
+# Add user to sudoers
+Add 'qt ALL=NOPASSWD: ALL' to /etc/sudoers.d/qt
+Add 'GRUB_GFXMODE=1280x800' to /etc/default/grub
+sudo grub2-mkconfig -o /etc/grub2.cfg
+sudo grub2-mkconfig -o /boot/grub2/grub.cfg
+# Add support for virtio driver
+su
+echo "add_drivers+=\" virtio-blk \"" >> /etc/dracut.conf.d/virtio.conf
+dracut -f
+
+yum -y install qemu-guest-agent
+
+# Do these from Opennebula UI!
+
+# Enable network connection from right upper corner
+This is done when the VM is launched as persistent in OpenNebula.
+# Fetch and run coin-setup
+Download http://coin/coin/binary/linux_amd64/coin-setup
+# run as qt user
+run './coin-setup'
+# Switch to use GNOME Classic user interface
+# GNOME Classic was selected because there's an issue with Starndard (wayland display server). Autotest start failing because terminal session remains in Activities Overview.
+# https://gitlab.gnome.org/GNOME/gnome-shell/-/issues/3854
+First execute script ./01-disable-automounting.sh (dconf update crash in GNOME Classic)
+logout -> Select user (without it the drop down menu won't appear) -> switch to 'GNOME Classic' from drop down menu in login screen
+Reboot

coin/pre-provisioning/qtci-linux-Ubuntu-24.04-x86_64/README_MANUAL_INSTALLATIONS

@@ -53,6 +53,17 @@ run 'sudo ufw disable'
 
 run 'sudo apt install qemu-guest-agent'
 
+# Install no-overview gnome extension to prevent desktop overview at boot (QTBUG-132070)
+#  - https://extensions.gnome.org/extension/4099/no-overview/
+#  - Select GNOME Shell version 46 to download
+#  - Unpack extension to (mkdir): /usr/share/gnome-shell/extensions/no-overview@fthx
+sudo chown -R root /usr/share/gnome-shell/extensions/no-overview@fthx
+sudo chmod 755 -R /usr/share/gnome-shell/extensions/no-overview@fthx
+sudo reboot
+gnome-extensions list
+gnome-extensions enable no-overview@fthx
+gnome-extensions info no-overview@fthx  # Check for "Active"
+
 # Fetch and run coin-setup (in Opennebula)
 Download http://coin/coin/binary/linux_amd64/coin-setup
 run 'chmod +x ./coin-setup' to make it executable

coin/provisioning/common/linux/android_linux.sh

@@ -217,6 +217,10 @@ cp "${scripts_dir_name}/${emulator_script_filename}" "${HOME}"
 ANDROID_EMULATOR_RUNNER="${HOME}/${emulator_script_filename}"
 SetEnvVar "ANDROID_EMULATOR_RUNNER" "$ANDROID_EMULATOR_RUNNER"
 
+SetEnvVar "PATH" "\$PATH:$sdkTargetFolder/emulator"
+SetEnvVar "PATH" "\$PATH:$sdkTargetFolder/platform-tools"
+SetEnvVar "PATH" "\$PATH:$sdkTargetFolder/cmdline-tools/latest/bin"
+
 # Gradle Caching
 cp -r "${scripts_dir_name}/android/gradle_project" /tmp/gradle_project
 cd /tmp/gradle_project

coin/provisioning/common/linux/axivion/ci_config_common.json

@@ -2,6 +2,7 @@
     "Project": {
         "Git": {
             "_active": true,
+            "author_line": "author-mail",
             "sourceserver_gitdir": "/data/axivion/databases/$(env:TESTED_MODULE_COIN).git",
             "sourceserver_remote_url": "ssh://codereview.qt-project.org:29418/qt/$(env:TESTED_MODULE_COIN)"
         },
@@ -11,7 +12,12 @@
             },
             "directory": "../work/qt/$(env:TESTED_MODULE_COIN)",
             "ir": "$(env:IRNAME)",
-            "name": "qt_$(env:PACKAGE)_$(env:MODULE)_dev_$(env:TARGET_OS_COIN)"
+            "name": "qt_$(env:PACKAGE)_$(env:MODULE)_$(env:TESTED_MODULE_BRANCH_COIN)_$(env:TARGET_OS_COIN)"
+        },
+        "VCSIntegration": {
+            "vcs_mapping": {
+                "vcs_account_callback": "dsquery * forestroot -filter \"(&(objectCategory=Person)(mail=%1)) -attr sAMAccountName -l"
+            }
         }
     },
     "Results": {

coin/provisioning/common/linux/install-ninja.sh

@@ -15,18 +15,20 @@ case "$uname_m" in
     x86_64|amd64)
         sha256="6f98805688d19672bd699fbbfa2c2cf0fc054ac3df1f0e6a47664d963d530255"
         pkgname="ninja-$version-linux-x64.zip"
+        pkgnameExt="ninja-linux.zip"
         dirname="ninja-$version-linux-x64"
         ;;
     arm64|aarch64)
         sha256="5c25c6570b0155e95fce5918cb95f1ad9870df5768653afe128db822301a05a1"
         pkgname="ninja-$version-linux-arm64.zip"
+        pkgnameExt="ninja-linux-aarch64.zip"
         dirname="ninja-$version-linux-arm64"
         ;;
     *) fatal "Unknown architecture in uname: $uname_m" 43 ;;
 esac
 
 internalUrl="http://ci-files01-hki.ci.qt.io/input/ninja/$pkgname"
-externalUrl="https://github.com/ninja-build/ninja/releases/download/v$version/$pkgname"
+externalUrl="https://github.com/ninja-build/ninja/releases/download/v$version/$pkgnameExt"
 
 targetFile="$HOME/$pkgname"
 DownloadURL "$internalUrl" "$externalUrl" "$sha256" "$targetFile"

coin/provisioning/common/linux/install-nodejs.sh

@@ -8,17 +8,17 @@ source "${BASH_SOURCE%/*}/../unix/DownloadURL.sh"
 source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh"
 
 # This script will install node.js 18.16.0
-version="18.16.0"
+version="22.21.1"
 
 uname_m="$(uname -m)"
 case "$uname_m" in
     x86_64|amd64)
-        sha256="44d93d9b4627fe5ae343012d855491d62c7381b236c347f7666a7ad070f26548"
+        sha256="680d3f30b24a7ff24b98db5e96f294c0070f8f9078df658da1bce1b9c9873c88"
         pkgname="node-v$version-linux-x64.tar.xz"
         dirname="node-v$version-linux-x64"
         ;;
     arm64|aarch64)
-        sha256="c81dfa0bada232cb4583c44d171ea207934f7356f85f9184b32d0dde69e2e0ea"
+        sha256="e660365729b434af422bcd2e8e14228637ecf24a1de2cd7c916ad48f2a0521e1"
         pkgname="node-v$version-linux-arm64.tar.xz"
         dirname="node-v$version-linux-arm64"
         ;;

coin/provisioning/common/linux/install-vxworks-qemu.sh

@@ -13,7 +13,7 @@ QEMU_VER="8.2.3"
 PrimaryUrl="http://ci-files01-hki.ci.qt.io/input/qemu/qemu-$QEMU_VER.tar.xz"
 AltUrl="https://download.qemu.org/qemu-$QEMU_VER.tar.xz"
 SHA1="1b29c8105cf8d15b9e7fb6f8e85170b6c54a1788"
-InstallFromCompressedFileFromURL "$PrimaryUrl" "$AltUrl" "$SHA1" "/tmp" "$appPrefix"
+InstallFromCompressedFileFromURL "$PrimaryUrl" "$AltUrl" "$SHA1" "/tmp" ""
 
 targetFolder=/tmp/qemu-${QEMU_VER}
 mkdir -p "$targetFolder/build"

coin/provisioning/common/linux/sccache.sh

@@ -6,14 +6,13 @@ set -ex
 
 source "${BASH_SOURCE%/*}/../unix/sccache.sh"
 
-targetVersion=0.2.14
-
+targetVersion=v0.11.0
 if [[ $(uname -m) == 'aarch64' ]]; then
   targetArch=aarch64-unknown-linux-musl
-  sha1=0f9b57c423d77f7aa89bb642864ac7689d84d6a0
+  sha1=b7606d0fb461c0aa7351f511d9223416a322d52a
 else
   targetArch=x86_64-unknown-linux-musl
-  sha1=281680c0fc2c09173e94d12ba45d9f1b8e62e5b3
+  sha1=ef389a20c85b732cccd48436a5e28ed40bed2806
 fi
 
 installSccache "$targetArch" "$targetVersion" "$sha1"

coin/provisioning/common/macos/install-ffmpeg-ios.sh

@@ -0,0 +1,283 @@
+#!/usr/bin/env bash
+# Copyright (C) 2024 The Qt Company Ltd.
+# SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
+
+# This script will build and install FFmpeg static libs
+# Can take an optional final parameter to control installation directory
+set -eoux pipefail
+
+# Must match or be lower than the minimum iOS version supported by the version of Qt that is
+# is currently being built.
+readonly MINIMUM_IOS_VERSION="16.0"
+
+source "${BASH_SOURCE%/*}/../unix/ffmpeg-installation-utils.sh"
+
+ffmpeg_version=$(ffmpeg_version_default)
+ffmpeg_source_dir=$(download_ffmpeg)
+ffmpeg_config_options=$(get_ffmpeg_config_options "shared")
+default_prefix="/usr/local/ios/ffmpeg"
+prefix="${1:-$default_prefix}"
+
+# Qt doesn't utilize all FFmpeg components. This is a list of the ones
+# we care about
+ffmpeg_components="libavcodec libavformat libavutil libswresample libswscale"
+
+target_platform_to_sdk() {
+    local target_platform="$1"
+    if [[ "$target_platform" == "arm64-simulator" ]] \
+        || [[ "$target_platform" == "x86_64-simulator" ]]; then
+        echo "iphonesimulator"
+    elif [ "$target_platform" == "arm64-iphoneos" ]; then
+        echo "iphoneos"
+    else
+        echo "Error finding corresponding iOS SDK for target platform: ${target_platform}"
+        exit 1
+    fi
+}
+
+build_ffmpeg_ios() {
+    local target_platform="$1"
+    local target_cpu_arch=""
+    local target_sdk;
+    target_sdk="$(target_platform_to_sdk "${target_platform}")"
+
+    if [ "$target_platform" == "arm64-simulator" ]; then
+        target_cpu_arch="arm64"
+        minos="-mios-simulator-version-min=$MINIMUM_IOS_VERSION"
+    elif [ "$target_platform" == "x86_64-simulator" ]; then
+        target_cpu_arch="x86_64"
+        minos="-mios-simulator-version-min=$MINIMUM_IOS_VERSION"
+    elif [ "$target_platform" == "arm64-iphoneos" ]; then
+        target_cpu_arch="arm64"
+        minos="-miphoneos-version-min=$MINIMUM_IOS_VERSION"
+    else
+        echo "Error when building FFmpeg for iOS. Unknown parameter given for target_platform: '${target_platform}'"
+        exit 1
+    fi
+
+    local build_dir="$ffmpeg_source_dir/build_ios/$target_platform"
+    sudo mkdir -p "$build_dir"
+    pushd "$build_dir"
+
+    local sysroot;
+    sysroot="$(xcrun --sdk "${target_sdk}" --show-sdk-path)"
+    local cc;
+    cc="$(xcrun -f --sdk ${target_sdk} clang)"
+    local cxx;
+    cxx="$(xcrun -f --sdk ${target_sdk} clang++)"
+
+    # We add -g so we get debug symbols.
+    local common_arch_flags="${minos} -arch ${target_cpu_arch} -g"
+
+    local config_parameters=(
+        $ffmpeg_config_options
+        --sysroot="${sysroot}"
+        --enable-cross-compile
+        --enable-optimizations
+        --prefix="$prefix"
+        --arch="$target_cpu_arch"
+        --cc="$cc"
+        --cxx="$cxx"
+        --extra-cflags="${common_arch_flags}"
+        --extra-cxxflags="${common_arch_flags}"
+        --extra-ldflags="${common_arch_flags}"
+        --target-os=darwin
+        --enable-shared
+        --disable-static
+        --install-name-dir="@rpath"
+        --disable-audiotoolbox
+
+        # We perform manual stripping after generating dSYMs.
+        # Make sure to skip it during FFmpeg compilation.
+        --disable-stripping
+    )
+    sudo "$ffmpeg_source_dir/configure" "${config_parameters[@]}"
+
+    sudo make install DESTDIR="$build_dir/installed" -j4
+    popd
+}
+
+build_info_plist() {
+    local file_path="$1"
+    local framework_name="$2"
+    local framework_id="$3"
+
+    # Apple plist format has a strict requirement that the version string
+    # contains up to 3 numerics separated by a dot. Meanwhile, FFmpeg versioning
+    # tends to use an 'n' prefix in their versioning. We use a regex to convert
+    # and verify the version string.
+    #
+    # https://developer.apple.com/documentation/bundleresources/information-property-list/cfbundleversion
+    local formatted_ffmpeg_version
+    if [[ $ffmpeg_version =~ ([0-9]+(\.[0-9]+){0,2}) ]]; then
+        formatted_ffmpeg_version="${BASH_REMATCH[1]}"
+    else
+        echo "Unable to format FFmpeg version string '$ffmpeg_version' into corresponding Apple Info.plist format"
+        exit 1
+    fi
+
+    local minimum_version_key="MinimumOSVersion"
+    local supported_platforms="iPhoneOS"
+
+    info_plist="<?xml version=\"1.0\" encoding=\"UTF-8\"?>
+<!DOCTYPE plist PUBLIC \"-//Apple//DTD PLIST 1.0//EN\" \"http://www.apple.com/DTDs/PropertyList-1.0.dtd\">
+<plist version=\"1.0\">
+<dict>
+    <key>CFBundleDevelopmentRegion</key>
+    <string>en</string>
+    <key>CFBundleExecutable</key>
+    <string>${framework_name}</string>
+    <key>CFBundleIdentifier</key>
+    <string>${framework_id}</string>
+    <key>CFBundleInfoDictionaryVersion</key>
+    <string>6.0</string>
+    <key>CFBundleName</key>
+    <string>${framework_name}</string>
+    <key>CFBundlePackageType</key>
+    <string>FMWK</string>
+    <key>CFBundleShortVersionString</key>
+    <string>${formatted_ffmpeg_version}</string>
+    <key>CFBundleVersion</key>
+    <string>${formatted_ffmpeg_version}</string>
+    <key>CFBundleSignature</key>
+    <string>????</string>
+    <key>${minimum_version_key}</key>
+    <string>${MINIMUM_IOS_VERSION}</string>
+    <key>CFBundleSupportedPlatforms</key>
+    <array>
+        <string>${supported_platforms}</string>
+    </array>
+    <key>NSPrincipalClass</key>
+    <string></string>
+</dict>
+</plist>"
+    echo $info_plist | sudo tee ${file_path} 1>/dev/null
+}
+
+# Create a 'traditional' framework from the corresponding dylib.
+# This includes creating a folder for it, and inserting Info.plist
+# and dylib. We also patch runpaths in the dylib to match the
+# frameworks directory structure.
+create_framework() {
+    local ffmpeg_component_name="$1"
+    local platform="$2"
+
+    local ffmpeg_build_path="${ffmpeg_source_dir}/build_ios/${platform}/installed/${prefix}"
+    local ffmpeg_component_src_dylib="${ffmpeg_build_path}/lib/${ffmpeg_component_name}.dylib"
+    local ffmpeg_component_framework="${ffmpeg_build_path}/framework/${ffmpeg_component_name}.framework"
+    local ffmpeg_component_target_dylib="${ffmpeg_component_framework}/${ffmpeg_component_name}"
+
+    # Make directory for the .framework
+    sudo mkdir -p "${ffmpeg_component_framework}"
+
+    # Inser the Info.plist
+    build_info_plist \
+        "${ffmpeg_component_framework}/Info.plist" \
+        "${ffmpeg_component_name}" \
+        "io.qt.ffmpegkit.${ffmpeg_component_name}"
+
+    # Copy in the dylib
+    sudo cp \
+        "${ffmpeg_component_src_dylib}" \
+        "${ffmpeg_component_target_dylib}"
+
+    # By default, runpaths will look for FFmpeg dependencies in
+    # '@rpath/libavcodec.xx.yy.dylib'. We want this path to be in the form
+    # '@rpath/libavcodec.framework/libavcodec.dylib'.
+
+    # Set the dylibs self-identity
+    sudo install_name_tool \
+        -id "@rpath/${ffmpeg_component_name}.framework/${ffmpeg_component_name}" \
+        "${ffmpeg_component_target_dylib}"
+
+    # Update the runpaths for each FFmpeg dependency entry
+    otool -L "$ffmpeg_component_target_dylib" \
+        | tail -n +2 \
+        | awk '{print $1}' \
+        | while read -r dep; do
+            # Go through all dependency entries of this .dylib,
+            # see if they point to a FFmpeg component. If it does,
+            # modify the entry to match the final
+            # directory structure.
+            for ffdep in $ffmpeg_components; do
+                if [[ "$dep" == */${ffdep}.* ]]; then
+                    echo "Rewriting dependency: $dep -> @rpath/${ffdep}.framework/${ffdep}"
+                    sudo install_name_tool -change \
+                        "$dep" \
+                        "@rpath/${ffdep}.framework/${ffdep}" \
+                        "$ffmpeg_component_target_dylib"
+                fi
+            done
+        done
+}
+
+# dSYM symbols must be generated manually, these are required for
+# App Store deployment. We generate them from the .dylibs inside
+# our .frameworks. This has to be done after patching the runpaths.
+# At the end, we strip the dylib.
+create_dsym() {
+    local ffmpeg_component_name="$1"
+    local platform="$2"
+
+    local ffmpeg_build_path="${ffmpeg_source_dir}/build_ios/${platform}/installed/${prefix}"
+    local target_dylib="${ffmpeg_build_path}/framework/${ffmpeg_component_name}.framework/${ffmpeg_component_name}"
+
+    sudo dsymutil "${target_dylib}" \
+        -o "${ffmpeg_build_path}/framework/${ffmpeg_component_name}.framework.dSYM"
+
+    local target_sdk;
+    target_sdk=$(target_platform_to_sdk "${platform}")
+
+    local strip;
+    strip="$(xcrun -f --sdk ${target_sdk} strip)"
+    sudo ${strip} -x "${target_dylib}"
+}
+
+create_xcframework() {
+    # Create 'traditional' framework from the corresponding dylib,
+    # also creating
+    local framework_name="$1"
+    local target_platform_a="$2"
+    local target_platform_b="$3"
+
+    local platform_a_build="${ffmpeg_source_dir}/build_ios/${target_platform_a}/installed/${prefix}"
+    local fw_a="${platform_a_build}/framework/${framework_name}.framework"
+    local dsym_a="${fw_a}.dSYM"
+
+    local platform_b_build="${ffmpeg_source_dir}/build_ios/${target_platform_b}/installed/${prefix}"
+    local fw_b="${platform_b_build}/framework/${framework_name}.framework"
+    local dsym_b="${fw_b}.dSYM"
+
+    sudo mkdir -p "$prefix/framework/"
+    sudo xcodebuild -create-xcframework \
+        -framework "$fw_a" -debug-symbols "$dsym_a" \
+        -framework $fw_b -debug-symbols "$dsym_b" \
+        -output "${prefix}/lib/${framework_name}.xcframework"
+}
+
+build_ffmpeg_ios "arm64-iphoneos"
+build_ffmpeg_ios "x86_64-simulator"
+
+for name in $ffmpeg_components; do
+    create_framework "$name" "arm64-iphoneos"
+    create_framework "$name" "x86_64-simulator"
+
+    create_dsym "$name" "arm64-iphoneos"
+    create_dsym "$name" "x86_64-simulator"
+done
+
+# Create corresponding xcframeworks containing both arm64 and x86_64-simulator frameworks:
+for name in $ffmpeg_components; do
+    create_xcframework "$name" "arm64-iphoneos" "x86_64-simulator"
+done
+
+# xcframeworks are already installed directly into the target output directory.
+# We need to install headers
+sudo cp -r "${ffmpeg_source_dir}/build_ios/arm64-iphoneos/installed/${prefix}/include" "$prefix"
+
+# The set_ffmpeg_dir_env_var requires the presence of the "lib" subfolder in order to validate
+# our FFmpeg install. On iOS we don't use this subfolder, we only rely on the "framework" subfolder.
+# So we create a dummy "lib" folder to pass the check.
+sudo mkdir -p "${prefix}/lib"
+
+set_ffmpeg_dir_env_var "FFMPEG_DIR_IOS" "$prefix"

coin/provisioning/common/macos/nodejs.sh

@@ -7,10 +7,10 @@ source "${BASH_SOURCE%/*}/../unix/DownloadURL.sh"
 
 # This script will install Nodejs
 
-version="18.16.0"
+version="22.21.1"
 urlCache="http://ci-files01-hki.ci.qt.io/input/nodejs/node-v$version.pkg"
 urlOffcial="https://nodejs.org/dist/v$version/node-v$version.pkg"
-sha256="156aa5b9580288fb0b3c6134eb8fac64e50745d78d33eebe9e29eb7ff87b8e1e"
+sha256="182ad62634eabbb11497c2284a3172771944f1cd17e23b143e778bd189af6d65"
 
 DownloadURL $urlCache $urlOffcial $sha256 "/tmp/node-v$version.pkg"
 sudo installer -pkg "/tmp/node-v$version.pkg" -target /

coin/provisioning/common/macos/sccache.sh

@@ -6,12 +6,12 @@ set -ex
 
 source "${BASH_SOURCE%/*}/../unix/sccache.sh"
 
-targetVersion=0.2.14
+targetVersion=v0.11.0
 if [[ `arch` == arm* ]]; then
     targetArch=aarch64-apple-darwin
-    sha1=ad10cd4b8889fa08e193a4165ac664876a27c0dc
+    sha1=3261ab99e5bb1f9f36eafa597d11491bd85da5ec
 else
     targetArch=x86_64-apple-darwin
-    sha1=764bc1664c0ff616d9980a6d127175d0a2041781
+    sha1=57810789bf2813dfa9bf5da26a712dc30b56ce16
 fi
 installSccache "$targetArch" "$targetVersion" "$sha1"

coin/provisioning/common/shared/fix_ffmpeg_dependencies.sh

@@ -7,6 +7,7 @@ set -euox pipefail
 lib_dir="$1/lib"
 additional_suffix="${2:-}"
 set_rpath="${3:-yes}"
+page_size="${4:-}"
 
 # readelf and patchelf are prerequisite tools for this script. Check
 # that they are available.
@@ -81,7 +82,12 @@ for lib_name in "${ffmpeg_libs[@]}"; do
                 stub_name="${stub_name%%.*}${additional_suffix}.${stub_name#*.}" # Add additional_suffix
             fi
 
-            patchelf --replace-needed "${BASH_REMATCH[1]}" "${stub_name}" "$lib_path"
+            additional_command_args=""
+            if [ -n "$page_size" ]; then
+                additional_command_args+="--page-size ${page_size}"
+            fi
+
+            patchelf ${additional_command_args} --replace-needed "${BASH_REMATCH[1]}" "${stub_name}" "$lib_path"
         fi
     done <<< "$(read_needed_deps)"
 

coin/provisioning/common/shared/testserver/qt_ubuntu_16.04/Dockerfile

@@ -1,5 +1,10 @@
 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."
+RUN test x"$COIN_RUNS_IN_QT_COMPANY" = xtrue \
+  && { printf '%s\n' \
+  'deb [arch=amd64 trusted=yes] http://repo-clones-apt.ci.qt.io:8080 xenial-amd64 main restricted universe multiverse' \
+  'deb [arch=amd64 trusted=yes] http://repo-clones-apt.ci.qt.io:8080 xenial-updates-amd64 main restricted universe multiverse' \
+  'deb [arch=amd64 trusted=yes] http://repo-clones-apt.ci.qt.io:8080 xenial-backports-amd64 main restricted universe' \
+  'deb [arch=amd64 trusted=yes] http://repo-clones-apt.ci.qt.io:8080 xenial-security-amd64 main restricted universe multiverse' \
+> /etc/apt/sources.list; \
+  } \

coin/provisioning/common/shared/testserver/qt_ubuntu_18.04/Dockerfile

@@ -1,5 +1,10 @@
 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."
+RUN test x"$COIN_RUNS_IN_QT_COMPANY" = xtrue \
+  && { printf '%s\n' \
+  'deb [arch=amd64 trusted=yes] http://repo-clones-apt.ci.qt.io:8080 bionic-amd64 main restricted universe multiverse' \
+  'deb [arch=amd64 trusted=yes] http://repo-clones-apt.ci.qt.io:8080 bionic-updates-amd64 main restricted universe multiverse' \
+  'deb [arch=amd64 trusted=yes] http://repo-clones-apt.ci.qt.io:8080 bionic-backports-amd64 main restricted universe' \
+  'deb [arch=amd64 trusted=yes] http://repo-clones-apt.ci.qt.io:8080 bionic-security-amd64 main restricted universe multiverse' \
+> /etc/apt/sources.list; \
+  } \

coin/provisioning/common/unix/common.sourced.sh

@@ -116,7 +116,7 @@ set_common_environment () {
     CMD_INSTALL="sudo install"
 
     COIN_RUNS_IN_QT_COMPANY=false
-    if  ping -c1 repo-clones.ci.qt.io  >/dev/null 2>&1
+    if  ping -c1 repo-clones-apt.ci.qt.io  >/dev/null 2>&1
     then
         COIN_RUNS_IN_QT_COMPANY=true
     fi

coin/provisioning/common/unix/ffmpeg-installation-utils.sh

@@ -3,12 +3,12 @@
 # SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
 
 ffmpeg_version_default() {
-    echo "n7.1.2"
+    echo "n7.1.3"
 }
 
 download_ffmpeg() {
     local version="${1:-$(ffmpeg_version_default)}"
-    local sha1="${2:-1e4e937facdbde15943dd093121836bf69f27c7c}"
+    local sha1="${2:-27051817deec88bed3b9652d49f9127d22268d83}"
 
     local ffmpeg_name="FFmpeg-$version"
     local target_dir="$HOME"

coin/provisioning/common/unix/install-ffmpeg-android.sh

@@ -82,12 +82,13 @@ build_ffmpeg_android() {
     local cc=${toolchain_bin}/${target_toolchain_arch}${api_version}-clang
     local ar=${toolchain_bin}/llvm-ar
     local ranlib=${toolchain_bin}/llvm-ranlib
+    local strip=${toolchain_bin}/llvm-strip
     local ffmpeg_config_options
 
     ffmpeg_config_options=$(get_ffmpeg_config_options $build_type)
     ffmpeg_config_options+=" --enable-cross-compile --target-os=android --enable-jni --enable-mediacodec --enable-openssl --enable-pthreads --enable-neon --disable-asm --disable-indev=android_camera"
     ffmpeg_config_options+=" --arch=$target_arch --cpu=${target_cpu} --sysroot=${sysroot} --sysinclude=${sysroot}/usr/include/"
-    ffmpeg_config_options+=" --cc=${cc} --cxx=${cxx} --ar=${ar} --ranlib=${ranlib}"
+    ffmpeg_config_options+=" --cc=${cc} --cxx=${cxx} --ar=${ar} --ranlib=${ranlib} --strip=${strip}"
     ffmpeg_config_options+=" --extra-cflags=-I${openssl_include} --extra-ldflags=-L${openssl_libs}"
     if [ $page_size == "use_16kb_page_size" ]; then
         ffmpeg_config_options+=" --extra-ldflags=-Wl,-z,max-page-size=16384"
@@ -115,7 +116,13 @@ build_ffmpeg_android() {
 
     if [[ "$build_type" == "shared" ]]; then
         local fix_dependencies="${BASH_SOURCE%/*}/../shared/fix_ffmpeg_dependencies.sh"
-        sudo "${fix_dependencies}" "${target_dir}" "${libs_prefix}" "no"
+
+        local page_size_arg=""
+        if [ $page_size == "use_16kb_page_size" ]; then
+            page_size_arg="16384"
+        fi
+
+        sudo "${fix_dependencies}" "${target_dir}" "${libs_prefix}" "no" "$page_size_arg"
     fi
 }
 

coin/provisioning/common/unix/install-ffmpeg-ios.sh

@@ -1,188 +0,0 @@
-#!/usr/bin/env bash
-# Copyright (C) 2024 The Qt Company Ltd.
-# SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
-
-# This script will build and install FFmpeg static libs
-# Can take an optional final parameter to control installation directory
-set -ex
-
-# Must match or be lower than the minimum iOS version supported by the version of Qt that is
-# is currently being built.
-readonly MINIMUM_IOS_VERSION="16.0"
-
-source "${BASH_SOURCE%/*}/../unix/ffmpeg-installation-utils.sh"
-
-ffmpeg_version=$(ffmpeg_version_default)
-ffmpeg_source_dir=$(download_ffmpeg)
-ffmpeg_config_options=$(get_ffmpeg_config_options "shared")
-default_prefix="/usr/local/ios/ffmpeg"
-prefix="${1:-$default_prefix}"
-dylib_regex="^@rpath/.*\.dylib$"
-
-build_ffmpeg_ios() {
-    local target_platform=$1
-    local target_cpu_arch=""
-    if [ "$target_platform" == "arm64-simulator" ]; then
-        target_sdk="iphonesimulator"
-        target_cpu_arch="arm64"
-        minos="-mios-simulator-version-min=$MINIMUM_IOS_VERSION"
-    elif [ "$target_platform" == "x86_64-simulator" ]; then
-        target_sdk="iphonesimulator"
-        target_cpu_arch="x86_64"
-        minos="-mios-simulator-version-min=$MINIMUM_IOS_VERSION"
-    elif [ "$target_platform" == "arm64-iphoneos" ]; then
-        target_sdk="iphoneos"
-        target_cpu_arch="arm64"
-        minos="-miphoneos-version-min=$MINIMUM_IOS_VERSION"
-    else
-        echo "Error when building FFmpeg for iOS. Unknown parameter given for target_platform: '${target_platform}'"
-        exit 1
-    fi
-
-    local build_dir="$ffmpeg_source_dir/build_ios/$target_platform"
-    sudo mkdir -p "$build_dir"
-    pushd "$build_dir"
-
-    # shellcheck disable=SC2086
-    sudo "$ffmpeg_source_dir/configure" $ffmpeg_config_options \
-    --sysroot="$(xcrun --sdk "$target_sdk" --show-sdk-path)" \
-    --enable-cross-compile \
-    --enable-optimizations \
-    --prefix=$prefix \
-    --arch=$target_cpu_arch \
-    --cc="xcrun --sdk ${target_sdk} clang -arch $target_cpu_arch" \
-    --cxx="xcrun --sdk ${target_sdk} clang++ -arch $target_cpu_arch" \
-    --target-os=darwin \
-    --extra-ldflags="$minos" \
-    --enable-shared \
-    --disable-static \
-    --install-name-dir='@rpath' \
-    --disable-audiotoolbox
-
-    sudo make install DESTDIR="$build_dir/installed" -j4
-    popd
-}
-
-build_info_plist() {
-    local file_path="$1"
-    local framework_name="$2"
-    local framework_id="$3"
-
-    # Apple plist format has a strict requirement that the version string
-    # contains up to 3 numerics separated by a dot. Meanwhile, FFmpeg versioning
-    # tends to use an 'n' prefix in their versioning. We use a regex to convert
-    # and verify the version string.
-    #
-    # https://developer.apple.com/documentation/bundleresources/information-property-list/cfbundleversion
-    local formatted_ffmpeg_version
-    if [[ $ffmpeg_version =~ ([0-9]+(\.[0-9]+){0,2}) ]]; then
-        formatted_ffmpeg_version="${BASH_REMATCH[1]}"
-    else
-        echo "Unable to format FFmpeg version string '$ffmpeg_version' into corresponding Apple Info.plist format"
-        exit 1
-    fi
-
-    local minimum_version_key="MinimumOSVersion"
-    local supported_platforms="iPhoneOS"
-
-    info_plist="<?xml version=\"1.0\" encoding=\"UTF-8\"?>
-<!DOCTYPE plist PUBLIC \"-//Apple//DTD PLIST 1.0//EN\" \"http://www.apple.com/DTDs/PropertyList-1.0.dtd\">
-<plist version=\"1.0\">
-<dict>
-    <key>CFBundleDevelopmentRegion</key>
-    <string>en</string>
-    <key>CFBundleExecutable</key>
-    <string>${framework_name}</string>
-    <key>CFBundleIdentifier</key>
-    <string>${framework_id}</string>
-    <key>CFBundleInfoDictionaryVersion</key>
-    <string>6.0</string>
-    <key>CFBundleName</key>
-    <string>${framework_name}</string>
-    <key>CFBundlePackageType</key>
-    <string>FMWK</string>
-    <key>CFBundleShortVersionString</key>
-    <string>${formatted_ffmpeg_version}</string>
-    <key>CFBundleVersion</key>
-    <string>${formatted_ffmpeg_version}</string>
-    <key>CFBundleSignature</key>
-    <string>????</string>
-    <key>${minimum_version_key}</key>
-    <string>${MINIMUM_IOS_VERSION}</string>
-    <key>CFBundleSupportedPlatforms</key>
-    <array>
-        <string>${supported_platforms}</string>
-    </array>
-    <key>NSPrincipalClass</key>
-    <string></string>
-</dict>
-</plist>"
-    echo $info_plist | sudo tee ${file_path} 1>/dev/null
-}
-
-
-create_framework() {
-    # Create a 'traditional' framework from the corresponding dylib.
-    local framework_name="$1"
-    local platform="$2" # For now it's either arm64, x86_64-simulator, see below.
-    local ffmpeg_library_path="$ffmpeg_source_dir/build_ios/${platform}/installed$prefix"
-    local framework_complete_path="${ffmpeg_library_path}/framework/${framework_name}.framework/${framework_name}"
-
-    sudo mkdir -p "${ffmpeg_library_path}/framework/${framework_name}.framework"
-    sudo cp "${ffmpeg_library_path}/lib/${framework_name}.dylib" "${ffmpeg_library_path}/framework/${framework_name}.framework/${framework_name}"
-
-    # Fix LC_ID_DYLIB (to be libavcodec.framework/libavcodec instead of @rpath/libavcodec.xx.yy.dylib
-    sudo install_name_tool -id @rpath/${framework_name}.framework/${framework_name} "${framework_complete_path}"
-
-    build_info_plist "${ffmpeg_library_path}/framework/${framework_name}.framework/Info.plist" "${framework_name}" "io.qt.ffmpegkit."${framework_name}
-
-    # Fix all FFmpeg-related LC_LOAD_DYLIB, similar to how we fixed LC_ID_DYLIB above:
-    otool -L "$framework_complete_path" | awk '/\t/ {print $1}' | egrep "$dylib_regex" | while read -r dependency_path; do
-        found_name=$(tmp=${dependency_path/*\/}; echo ${tmp/\.*})
-        if [ "$found_name" != "$framework_name" ]
-        then
-            sudo install_name_tool -change "$dependency_path" @rpath/${found_name}.framework/${found_name} "${framework_complete_path}"
-        fi
-    done
-    #sudo mkdir -p "$prefix/framework/"
-    #sudo cp -r "${ffmpeg_library_path}/framework/${framework_name}.framework" "$prefix/framework/"
-}
-
-create_xcframework() {
-    # Create 'traditional' framework from the corresponding dylib,
-    # also creating
-    local framework_name="$1"
-    local target_platform_a="$2"
-    local target_platform_b="$3"
-
-    local fw_a="$ffmpeg_source_dir/build_ios/${target_platform_a}/installed$prefix/framework/${framework_name}.framework"
-    local fw_b="$ffmpeg_source_dir/build_ios/${target_platform_b}/installed$prefix/framework/${framework_name}.framework"
-
-    sudo mkdir -p "$prefix/framework/"
-    sudo xcodebuild -create-xcframework -framework $fw_a -framework $fw_b -output "${prefix}/framework/${framework_name}.xcframework"
-}
-
-build_ffmpeg_ios "x86_64-simulator"
-build_ffmpeg_ios "arm64-iphoneos"
-
-ffmpeg_libs="libavcodec libavformat libavutil libswresample libswscale"
-
-for name in $ffmpeg_libs; do
-    create_framework $name "arm64-iphoneos"
-    create_framework $name "x86_64-simulator"
-done
-
-# Create corresponding (xc)frameworks containing both arm64 and arm64-simulator frameworks:
-for name in $ffmpeg_libs; do
-    create_xcframework $name "arm64-iphoneos" "x86_64-simulator"
-done
-
-# xcframeworks are already installed directly into the target output directory.
-# We need to install headers
-sudo cp -r "$ffmpeg_source_dir/build_ios/arm64-iphoneos/installed$prefix/include" $prefix
-# The set_ffmpeg_dir_env_var requires the presence of the "lib" subfolder in order to validate
-# our FFmpeg install. On iOS we don't use this subfolder, we only rely on the "framework" subfolder.
-# So we create a dummy "lib" folder to pass the check.
-sudo mkdir -p "${prefix}/lib"
-
-set_ffmpeg_dir_env_var "FFMPEG_DIR_IOS" $prefix

coin/provisioning/common/unix/install-openssl.sh

@@ -34,6 +34,7 @@ if [[ "$os" == "linux" ]]; then
     make && make install_sw install_ssldirs
     SetEnvVar "OPENSSL_HOME" "$opensslHome"
     SetEnvVar "PATH" "\"$opensslHome/bin:\$PATH\""
+    SetEnvVar "PKG_CONFIG_PATH" "\"$opensslHome/lib64/pkgconfig:\$PKG_CONFIG_PATH\""
     if uname -a |grep -q "Debian"; then
         SetEnvVar "LD_LIBRARY_PATH" "\"$opensslHome/lib:$LD_LIBRARY_PATH\""
     else

coin/provisioning/common/unix/install_grpc.sh

@@ -63,6 +63,7 @@ cmake "$targetDir" -G"Ninja Multi-Config" \
     -DCMAKE_POSITION_INDEPENDENT_CODE=ON \
     -DCMAKE_CONFIGURATION_TYPES="Release;Debug;RelWithDebugInfo" \
     -DCMAKE_INSTALL_PREFIX="$installPrefix" \
+    -DCMAKE_POLICY_VERSION_MINIMUM=3.5 \
     "${extraCMakeArgs[@]}" \
     "$extraOpenSslArg" \
     -DgRPC_BUILD_TESTS=OFF \

coin/provisioning/common/unix/openssl_for_android.sh

@@ -13,14 +13,17 @@ source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh"
 
 sslVersionForLatest="3.0.7"
 ndkVersionLatest="r27c"
+featureSuffixLatest="_16kb"
 prebuiltOpensslShaLatest="2cc15dd990460c2c7157ab257a47071fbd9e0ac8"
 
 ndkVersionNightly1=$ndkVersionLatest
 sslVersionForNightly1=$sslVersionForLatest
+featureSuffixNightly1=""
 prebuiltOpensslShaNightly1=$prebuiltOpensslShaLatest
 
 ndkVersionNightly2=$ndkVersionLatest
 sslVersionForNightly2=$sslVersionForLatest
+featureSuffixNightly2=""
 prebuiltOpensslShaNightly2=$prebuiltOpensslShaLatest
 
 : <<'EOB' SOURCE BUILD INSTRUCTIONS - Openssl prebuilt was made using Android NDK r27c
@@ -58,32 +61,46 @@ EOB
 function InstallPrebuiltOpenssl() {
 
     ndkVersion=$1
-    sha=$2
-    sslVersion=$3
+    suffix=$2
+    sha=$3
+    sslVersion=$4
 
-    opensslHome="${HOME}/prebuilt-openssl-${sslVersion}-for-android-ndk-${ndkVersion}_16kb"
-    if [[ ! -d ${opensslHome} ]]; then
-        prebuiltUrl="http://ci-files01-hki.ci.qt.io/input/openssl/prebuilt-openssl-${sslVersion}-for-android-ndk-${ndkVersion}_16kb.zip"
-        targetFile="/tmp/prebuilt-openssl-${sslVersion}-for-android-ndk-${ndkVersion}_16kb.zip"
+    renamed_root="${HOME}/prebuilt-openssl-${sslVersion}-for-android-ndk-${ndkVersion}${suffix}"
 
-        DownloadURL "$prebuiltUrl" "$prebuiltUrl" "$sha" "$targetFile"
-        unzip -o "$targetFile" -d "${HOME}"
-        sudo rm -f "$targetFile"
+    prebuiltUrl="http://ci-files01-hki.ci.qt.io/input/openssl/prebuilt-openssl-${sslVersion}-for-android-ndk-${ndkVersion}${suffix}.zip"
+    targetFile="/tmp/prebuilt-openssl-${sslVersion}-for-android-ndk-${ndkVersion}${suffix}.zip"
+
+    DownloadURL "$prebuiltUrl" "$prebuiltUrl" "$sha" "$targetFile"
+
+    tmp_extract="$(mktemp -d "${TMPDIR:-/tmp}/openssl-extract.XXXXXX")"
+    unzip -q -o "$targetFile" -d "$tmp_extract"
+    sudo rm -f "$targetFile"
+
+    # We assume there is only one top-level directory in the openssl zip
+    temp_openssl_root="$(find "$tmp_extract" -mindepth 1 -maxdepth 1 -type d | head -n 1)"
+    if [[ -z "$temp_openssl_root" ]]; then
+        echo "ERROR: Expected a single top-level directory in the archive, but none was found." >&2
+        return 1
     fi
+
+    mv "$temp_openssl_root" "$renamed_root"
+    rm -rf "$tmp_extract"
+
+    opensslHome="${renamed_root}"
 }
 
 if [ "$ndkVersionNightly1" != "$ndkVersionLatest" ]; then
-    InstallPrebuiltOpenssl $ndkVersionNightly1 $prebuiltOpensslShaNightly1 $sslVersionForNightly1
+    InstallPrebuiltOpenssl "$ndkVersionNightly1" "$featureSuffixNightly1" "$prebuiltOpensslShaNightly1" "$sslVersionForNightly1"
     SetEnvVar "OPENSSL_ANDROID_HOME_NIGHTLY1" "$opensslHome"
     echo "OpenSSL for Android $ndkVersionNightly1 = $sslVersionForNightly1" >> ~/versions.txt
 fi
 
 if [ "$ndkVersionNightly2" != "$ndkVersionLatest" ]; then
-    InstallPrebuiltOpenssl $ndkVersionNightly2 $prebuiltOpensslShaNightly2 $sslVersionForNightly2
+    InstallPrebuiltOpenssl "$ndkVersionNightly2" "$featureSuffixNightly2" "$prebuiltOpensslShaNightly2" "$sslVersionForNightly2"
     SetEnvVar "OPENSSL_ANDROID_HOME_NIGHTLY2" "$opensslHome"
     echo "OpenSSL for Android $ndkVersionNightly2 = $sslVersionForNightly2" >> ~/versions.txt
 fi
 
-InstallPrebuiltOpenssl $ndkVersionLatest $prebuiltOpensslShaLatest $sslVersionForLatest
+InstallPrebuiltOpenssl "$ndkVersionLatest" "$featureSuffixLatest" "$prebuiltOpensslShaLatest" "$sslVersionForLatest"
 SetEnvVar "OPENSSL_ANDROID_HOME_LATEST" "$opensslHome"
 echo "OpenSSL for Android $ndkVersionLatest = $sslVersionForLatest" >> ~/versions.txt

coin/provisioning/common/windows/install-ffmpeg.ps1

@@ -7,9 +7,9 @@
 # This script will install FFmpeg
 $msys = "C:\Utils\msys64\usr\bin\bash"
 
-$version="n7.1.2"
+$version="n7.1.3"
 $url_public="https://github.com/FFmpeg/FFmpeg/archive/refs/tags/$version.tar.gz"
-$sha1="1e4e937facdbde15943dd093121836bf69f27c7c"
+$sha1="27051817deec88bed3b9652d49f9127d22268d83"
 $url_cached="http://ci-files01-hki.ci.qt.io/input/ffmpeg/$version.tar.gz"
 $ffmpeg_name="FFmpeg-$version"
 

coin/provisioning/common/windows/install-sccache.ps1

@@ -3,14 +3,34 @@
 
 # Install mozilla sccache
 
-param(
-    [string]$arch="x86_64-pc-windows-msvc",
-    [string]$version="0.2.14",
-    [string]$sha1="bbdceb59d6fd7b6a3af02fb36f65c8bf324757b0"
-)
 
 . "$PSScriptRoot\helpers.ps1"
 
+$version="v0.11.0-jimis3"
+$cpu_arch = Get-CpuArchitecture
+switch ($cpu_arch) {
+    arm64 {
+        $arch="aarch64-pc-windows-msvc"
+        $sha1="be429b6c33da9408bba827815d04fceeadf6dbd1"
+        break
+    }
+    x64 {
+        $arch="x86_64-pc-windows-msvc"
+        $sha1="bcce35f6b39e2d1d0829f2277fd749767e057486"
+        break
+    }
+    x86 {
+        $arch="x86-pc-windows-gnu"
+        $sha1="287f4c3b7db21b72138704b8fe96827e6b1643a8"
+        $version="0.2.13-alpha-0"
+        break
+    }
+
+    default {
+        throw "Unknown architecture $cpu_arch"
+    }
+}
+
 $basename = "sccache-" + $version + "-" + $arch
 $zipfile = $basename + ".tar.gz"
 $tempfile = "C:\Windows\Temp\" + $zipfile
@@ -28,6 +48,9 @@ Remove-Item -Path $tempfile
 # Turnoff idle timeout to avoid sccache shutting down
 Set-EnvironmentVariable "SCCACHE_IDLE_TIMEOUT" "0"
 
+# Prevents build job dying from random network I/O errors
+Set-EnvironmentVariable "SCCACHE_IGNORE_SERVER_IO_ERROR" "1"
+
 # add sccache to PATH
 Set-EnvironmentVariable "PATH" "C:\Program Files\$basename\;$([Environment]::GetEnvironmentVariable('PATH', 'Machine'))"
 

coin/provisioning/qtci-linux-Debian-11.6-aarch64/02-apt.sh

@@ -54,7 +54,9 @@ installPackages+=(libgbm-dev)
 installPackages+=(libxkbfile-dev)
 installPackages+=(libxshmfence-dev)
 installPackages+=(libxss-dev)
-# installPackages+=(nodejs) too old
+installPackages+=(rustc)
+installPackages+=(bindgen)
+installPackages+=(clang)
 installPackages+=(python3-html5lib)
 #
 ## Common event loop handling
@@ -250,6 +252,8 @@ installPackages+=(libusb-1.0-0-dev)
 # password management support for Qt Creator
 installPackages+=(libsecret-1-dev)
 installPackages+=(debian-archive-keyring)
+# Keep zoneinfo up-to-date (COIN-1282)
+installPackages+=(tzdata)
 
 
 echo "Running update for apt"

coin/provisioning/qtci-linux-RHEL-8.10-x86_64/03-enable-repos.sh

@@ -14,7 +14,7 @@ while sudo fuser /usr/libexec/packagekitd >/dev/null 2>&1; do
 done
 sudo yum -y remove PackageKit gnome-software
 
-sudo subscription-manager config --rhsm.manage_repos=1
+sudo subscription-manager config --rhsm.manage_repos=0
 sudo subscription-manager refresh
 
 # List available RHEL versions and bind with correct one
@@ -22,10 +22,35 @@ sudo subscription-manager release --list
 sudo subscription-manager release --set=8.10
 sudo yum clean all
 
-# sudo yum config-manager --enable 'rhceph-4-tools-for-rhel-8-x86_64-rpms'
-sudo yum config-manager --enable 'codeready-builder-for-rhel-8-x86_64-rpms'
-sudo yum config-manager --enable 'rhel-8-for-x86_64-baseos-rpms'
-sudo yum config-manager --enable 'rhel-8-for-x86_64-appstream-rpms'
+sudo tee "/etc/yum.repos.d/local.repo" > /dev/null <<EOC
+[rhel-8-for-x86_64-baseos-rpms]
+metadata_expire = 86400
+baseurl = http://repo-clones.ci.qt.io/repos/rhel-8-for-x86_64-baseos-rpms
+ui_repoid_vars = releasever basearch
+name = Qt Red Hat Enterprise Linux 8 Base OS (RPMs)
+gpgkey = file:///etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-release
+enabled = 1
+gpgcheck = 1
+
+[rhel-8-for-x86_64-appstream-rpms]
+metadata_expire = 86400
+baseurl = http://repo-clones.ci.qt.io/repos/rhel-8-for-x86_64-appstream-rpms
+ui_repoid_vars = releasever basearch
+name = Qt Red Hat Enterprise Linux 8 Appstream (RPMs)
+gpgkey = file:///etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-release
+enabled = 1
+gpgcheck = 1
+
+[codeready-builder-for-rhel-8-x86_64-rpms]
+metadata_expire = 86400
+baseurl = http://repo-clones.ci.qt.io/repos/codeready-builder-for-rhel-8-x86_64-rpms
+ui_repoid_vars = releasever basearch
+name = Qt Red Hat Enterprise Linux Codeready Builder (RPMs)
+gpgkey = file:///etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-release
+enabled = 1
+gpgcheck = 1
+EOC
+
 # Epel is required for 'double-conversion-devel', 'libsqlite3x' and 'p7zip'
 sudo dnf install -y https://dl.fedoraproject.org/pub/epel/epel-release-latest-8.noarch.rpm
 

coin/provisioning/qtci-linux-RHEL-8.10-x86_64/04-install-packages.sh

@@ -17,8 +17,6 @@ installPackages+=(ca-certificates)
 installPackages+=(git)
 installPackages+=(zlib-devel)
 installPackages+=(glib2-devel)
-installPackages+=(openssl3)
-installPackages+=(openssl3-devel)
 installPackages+=(freetype-devel)
 installPackages+=(fontconfig-devel)
 installPackages+=(curl-devel)
@@ -157,10 +155,12 @@ installPackages+=(perl-IPC-Cmd)
 installPackages+=(libsecret-devel)
 # For tst_license.pl with all the machines generating SBOM
 installPackages+=(perl-JSON)
+# Keep zoneinfo up-to-date (COIN-1282)
+installPackages+=(tzdata)
 
 sudo yum -y install "${installPackages[@]}"
 
-sudo dnf -y module install nodejs:16
+sudo dnf -y module install nodejs:20
 
 # We shouldn't use yum to install virtualenv. The one found from package repo is not
 # working, but we can use installed pip
@@ -184,8 +184,5 @@ echo "GCC = $gccVersion" >> versions.txt
 glibcVersion="$(ldd --version |grep -Eo '[0-9]+\.[0-9]+(\.[0-9]+)?' |head -n 1)"
 echo "glibc = $glibcVersion" >> versions.txt
 
-OpenSSLVersion="$(openssl3 version |cut -b 9-14)"
-echo "System's OpenSSL = $OpenSSLVersion" >> ~/versions.txt
-
 # List all available updates
 sudo yum -y list updates

coin/provisioning/qtci-linux-RHEL-8.2-x86_64/04-install-packages.sh

@@ -124,6 +124,8 @@ installPackages+=(make)
 installPackages+=(open-vm-tools)
 # Install all available locales (COIN-727)
 installPackages+=(langpacks-*)
+# Keep zoneinfo up-to-date (COIN-1282)
+installPackages+=(tzdata)
 
 sudo yum -y install "${installPackages[@]}"
 

coin/provisioning/qtci-linux-RHEL-8.4-x86_64/03-enable-repos.sh

@@ -9,7 +9,7 @@ sudo systemctl stop packagekit
 sudo systemctl disable packagekit
 sudo yum -y remove PackageKit gnome-software
 
-sudo subscription-manager config --rhsm.manage_repos=1
+sudo subscription-manager config --rhsm.manage_repos=0
 sudo subscription-manager refresh
 
 # List available RHEL versions and bind with correct one
@@ -17,10 +17,35 @@ sudo subscription-manager release --list
 sudo subscription-manager release --set=8.4
 sudo yum clean all
 
-# sudo yum config-manager --enable 'rhceph-4-tools-for-rhel-8-x86_64-rpms'
-sudo yum config-manager --enable 'codeready-builder-for-rhel-8-x86_64-rpms'
-sudo yum config-manager --enable 'rhel-8-for-x86_64-baseos-rpms'
-sudo yum config-manager --enable 'rhel-8-for-x86_64-appstream-rpms'
+sudo tee "/etc/yum.repos.d/local.repo" > /dev/null <<EOC
+[rhel-8-for-x86_64-baseos-rpms]
+metadata_expire = 86400
+baseurl = http://repo-clones.ci.qt.io/repos/rhel-8-for-x86_64-baseos-rpms
+ui_repoid_vars = releasever basearch
+name = Qt Red Hat Enterprise Linux 8 Base OS (RPMs)
+gpgkey = file:///etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-release
+enabled = 1
+gpgcheck = 1
+
+[rhel-8-for-x86_64-appstream-rpms]
+metadata_expire = 86400
+baseurl = http://repo-clones.ci.qt.io/repos/rhel-8-for-x86_64-appstream-rpms
+ui_repoid_vars = releasever basearch
+name = Qt Red Hat Enterprise Linux 8 Appstream (RPMs)
+gpgkey = file:///etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-release
+enabled = 1
+gpgcheck = 1
+
+[codeready-builder-for-rhel-8-x86_64-rpms]
+metadata_expire = 86400
+baseurl = http://repo-clones.ci.qt.io/repos/codeready-builder-for-rhel-8-x86_64-rpms
+ui_repoid_vars = releasever basearch
+name = Qt Red Hat Enterprise Linux Codeready Builder (RPMs)
+gpgkey = file:///etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-release
+enabled = 1
+gpgcheck = 1
+EOC
+
 # Epel is required for 'double-conversion-devel', 'libsqlite3x' and 'p7zip'
 sudo dnf install -y https://dl.fedoraproject.org/pub/epel/epel-release-latest-8.noarch.rpm
 

coin/provisioning/qtci-linux-RHEL-8.4-x86_64/04-install-packages.sh

@@ -134,6 +134,8 @@ installPackages+=(gcc-c++)
 installPackages+=(make)
 # Open source VMware Tools
 installPackages+=(open-vm-tools)
+# Keep zoneinfo up-to-date (COIN-1282)
+installPackages+=(tzdata)
 
 sudo yum -y install "${installPackages[@]}"
 

coin/provisioning/qtci-linux-RHEL-8.6-x86_64/04-install-packages.sh

@@ -143,6 +143,8 @@ installPackages+=(gcc-c++)
 installPackages+=(make)
 # Open source VMware Tools
 installPackages+=(open-vm-tools)
+# Keep zoneinfo up-to-date (COIN-1282)
+installPackages+=(tzdata)
 
 sudo yum -y install "${installPackages[@]}"
 

coin/provisioning/qtci-linux-RHEL-8.8-x86_64/03-enable-repos.sh

@@ -14,7 +14,7 @@ while sudo fuser /usr/libexec/packagekitd >/dev/null 2>&1; do
 done
 sudo yum -y remove PackageKit gnome-software
 
-sudo subscription-manager config --rhsm.manage_repos=1
+sudo subscription-manager config --rhsm.manage_repos=0
 sudo subscription-manager refresh
 
 # List available RHEL versions and bind with correct one
@@ -22,10 +22,35 @@ sudo subscription-manager release --list
 sudo subscription-manager release --set=8.8
 sudo yum clean all
 
-# sudo yum config-manager --enable 'rhceph-4-tools-for-rhel-8-x86_64-rpms'
-sudo yum config-manager --enable 'codeready-builder-for-rhel-8-x86_64-rpms'
-sudo yum config-manager --enable 'rhel-8-for-x86_64-baseos-rpms'
-sudo yum config-manager --enable 'rhel-8-for-x86_64-appstream-rpms'
+sudo tee "/etc/yum.repos.d/local.repo" > /dev/null <<EOC
+[rhel-8-for-x86_64-baseos-rpms]
+metadata_expire = 86400
+baseurl = http://repo-clones.ci.qt.io/repos/rhel-8-for-x86_64-baseos-rpms
+ui_repoid_vars = releasever basearch
+name = Qt Red Hat Enterprise Linux 8 Base OS (RPMs)
+gpgkey = file:///etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-release
+enabled = 1
+gpgcheck = 1
+
+[rhel-8-for-x86_64-appstream-rpms]
+metadata_expire = 86400
+baseurl = http://repo-clones.ci.qt.io/repos/rhel-8-for-x86_64-appstream-rpms
+ui_repoid_vars = releasever basearch
+name = Qt Red Hat Enterprise Linux 8 Appstream (RPMs)
+gpgkey = file:///etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-release
+enabled = 1
+gpgcheck = 1
+
+[codeready-builder-for-rhel-8-x86_64-rpms]
+metadata_expire = 86400
+baseurl = http://repo-clones.ci.qt.io/repos/codeready-builder-for-rhel-8-x86_64-rpms
+ui_repoid_vars = releasever basearch
+name = Qt Red Hat Enterprise Linux Codeready Builder (RPMs)
+gpgkey = file:///etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-release
+enabled = 1
+gpgcheck = 1
+EOC
+
 # Epel is required for 'double-conversion-devel', 'libsqlite3x' and 'p7zip'
 sudo dnf install -y https://dl.fedoraproject.org/pub/epel/epel-release-latest-8.noarch.rpm
 

coin/provisioning/qtci-linux-RHEL-8.8-x86_64/04-install-packages.sh

@@ -17,8 +17,6 @@ installPackages+=(ca-certificates)
 installPackages+=(git)
 installPackages+=(zlib-devel)
 installPackages+=(glib2-devel)
-installPackages+=(openssl3)
-installPackages+=(openssl3-devel)
 installPackages+=(freetype-devel)
 installPackages+=(fontconfig-devel)
 installPackages+=(curl-devel)
@@ -155,6 +153,8 @@ installPackages+=(zip)
 installPackages+=(perl-IPC-Cmd)
 # password management support for Qt Creator
 installPackages+=(libsecret-devel)
+# Keep zoneinfo up-to-date (COIN-1282)
+installPackages+=(tzdata)
 
 sudo yum -y install "${installPackages[@]}"
 
@@ -184,8 +184,5 @@ echo "GCC = $gccVersion" >> versions.txt
 glibcVersion="$(ldd --version |grep -Eo '[0-9]+\.[0-9]+(\.[0-9]+)?' |head -n 1)"
 echo "glibc = $glibcVersion" >> versions.txt
 
-OpenSSLVersion="$(openssl3 version |cut -b 9-14)"
-echo "System's OpenSSL = $OpenSSLVersion" >> ~/versions.txt
-
 # List all available updates
 sudo yum -y list updates

coin/provisioning/qtci-linux-RHEL-9.0-x86_64/04-install-packages.sh

@@ -144,7 +144,8 @@ installPackages+=(keyutils)
 installPackages+=(cifs-utils)
 # password management support for Qt Creator
 installPackages+=(libsecret-devel)
-
+# Keep zoneinfo up-to-date (COIN-1282)
+installPackages+=(tzdata)
 
 sudo yum -y install "${installPackages[@]}"
 

coin/provisioning/qtci-linux-RHEL-9.2-x86_64/04-install-packages.sh

@@ -170,6 +170,8 @@ installPackages+=(libsecret-devel)
 installPackages+=(libuuid-devel)
 # For Firebird in RTA
 installPackages+=(libtommath-devel)
+# Keep zoneinfo up-to-date (COIN-1282)
+installPackages+=(tzdata)
 
 sudo yum -y install "${installPackages[@]}"