[qt] Update build images to use GCC11 (#1889)
This commit is contained in:
2
.github/actions/qt5-build/Dockerfile
vendored
2
.github/actions/qt5-build/Dockerfile
vendored
@@ -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
|
||||
|
||||
2
.github/actions/qt5-build/entrypoint.sh
vendored
2
.github/actions/qt5-build/entrypoint.sh
vendored
@@ -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
|
||||
|
||||
2
.github/actions/qt6-build/Dockerfile
vendored
2
.github/actions/qt6-build/Dockerfile
vendored
@@ -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
|
||||
|
||||
2
.github/actions/qt6-build/entrypoint.sh
vendored
2
.github/actions/qt6-build/entrypoint.sh
vendored
@@ -1,5 +1,7 @@
|
||||
#!/bin/bash -l
|
||||
|
||||
source /opt/rh/gcc-toolset-11/enable
|
||||
|
||||
set -e
|
||||
set -x
|
||||
|
||||
|
||||
6
.github/workflows/qt-ci.yml
vendored
6
.github/workflows/qt-ci.yml
vendored
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user