From bf472b0703d34ff487f23ca4543cc90aefdc3c12 Mon Sep 17 00:00:00 2001
From: Tadej Novak <tadej@tano.si>
Date: Sun, 26 Nov 2023 16:30:28 +0100
Subject: [PATCH] [qt] Update build images to use GCC11 (#1889)

---
 .github/actions/qt5-build/Dockerfile    | 2 +-
 .github/actions/qt5-build/entrypoint.sh | 2 +-
 .github/actions/qt6-build/Dockerfile    | 2 +-
 .github/actions/qt6-build/entrypoint.sh | 2 ++
 .github/workflows/qt-ci.yml             | 6 ++++++
 5 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/.github/actions/qt5-build/Dockerfile b/.github/actions/qt5-build/Dockerfile
index d0446ae20..60a0c2914 100644
--- a/.github/actions/qt5-build/Dockerfile
+++ b/.github/actions/qt5-build/Dockerfile
@@ -1,4 +1,4 @@
-FROM ghcr.io/maplibre/linux-builder:centos7-cmake3.19
+FROM ghcr.io/maplibre/linux-builder:centos7-gcc11-cmake3.19
 
 # Copy and set the entry point
 COPY entrypoint.sh /entrypoint.sh
diff --git a/.github/actions/qt5-build/entrypoint.sh b/.github/actions/qt5-build/entrypoint.sh
index 868aa50ad..149fa528d 100755
--- a/.github/actions/qt5-build/entrypoint.sh
+++ b/.github/actions/qt5-build/entrypoint.sh
@@ -1,6 +1,6 @@
 #!/bin/bash -l
 
-source scl_source enable devtoolset-8 rh-git218
+source scl_source enable devtoolset-11 rh-git218
 
 set -e
 set -x
diff --git a/.github/actions/qt6-build/Dockerfile b/.github/actions/qt6-build/Dockerfile
index 5364ec0c6..63e721316 100644
--- a/.github/actions/qt6-build/Dockerfile
+++ b/.github/actions/qt6-build/Dockerfile
@@ -1,4 +1,4 @@
-FROM ghcr.io/maplibre/linux-builder:centos8-latest
+FROM ghcr.io/maplibre/linux-builder:centos8-gcc11
 
 # Copy and set the entry point
 COPY entrypoint.sh /entrypoint.sh
diff --git a/.github/actions/qt6-build/entrypoint.sh b/.github/actions/qt6-build/entrypoint.sh
index 528d64e48..8fef6a706 100755
--- a/.github/actions/qt6-build/entrypoint.sh
+++ b/.github/actions/qt6-build/entrypoint.sh
@@ -1,5 +1,7 @@
 #!/bin/bash -l
 
+source /opt/rh/gcc-toolset-11/enable
+
 set -e
 set -x
 
diff --git a/.github/workflows/qt-ci.yml b/.github/workflows/qt-ci.yml
index 42a5eb22f..7fb230b7e 100644
--- a/.github/workflows/qt-ci.yml
+++ b/.github/workflows/qt-ci.yml
@@ -64,6 +64,12 @@ jobs:
             qt_version: 5.15.2
             qt_target: desktop
             compiler: ""
+          - name: Linux
+            os: ubuntu-22.04
+            build_type: RelWithDebInfo
+            qt_version: 6.5.3
+            qt_target: desktop
+            compiler: ""
           - name: Linux_GCC13
             os: ubuntu-22.04
             build_type: RelWithDebInfo