Switch to gcc-13 on CI

CesiumGS · Oct 1, 2024 · 0594e65 · 0594e65
1 parent 842a961
commit 0594e65
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 16 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -34,8 +34,8 @@ jobs:
               name: "Ubuntu - GCC",
               artifact: "linux-gcc.tar.xz",
               os: ubuntu-latest,
-              cc: "gcc-11",
-              cxx: "g++-11",
+              cc: "gcc-13",
+              cxx: "g++-13",
               build-type: "Release",
               build-code: "Ubuntu",
               cache-type: "Linux",
@@ -46,8 +46,8 @@ jobs:
               name: "AlmaLinux 8 - GCC",
               artifact: "linux-gcc.tar.xz",
               os: ubuntu-latest,
-              cc: "gcc-11",
-              cxx: "g++-11",
+              cc: "gcc-13",
+              cxx: "g++-13",
               build-type: "Release",
               build-code: "AlmaLinux8",
               cache-type: "Linux",

diff --git a/docker/AlmaLinux8.Dockerfile b/docker/AlmaLinux8.Dockerfile
@@ -12,8 +12,8 @@ RUN dnf install -y -q \
     git \
     git-lfs \
     wget \
-    gcc-toolset-11 \
-    gcc-toolset-11-libubsan-devel \
+    gcc-toolset-13 \
+    gcc-toolset-13-libubsan-devel \
     make \
     doxygen \
     curl-devel \
@@ -29,8 +29,8 @@ RUN dnf install -y -q \
     sqlite-devel \
     xz-devel
 
-# Enables gcc 11 for use within the docker image.
-RUN echo "source /opt/rh/gcc-toolset-11/enable" >> /etc/bashrc
+# Enables gcc 13 for use within the docker image.
+RUN echo "source /opt/rh/gcc-toolset-13/enable" >> /etc/bashrc
 SHELL ["/bin/bash", "--login", "-c"]
 
 # Install newer version of Python

diff --git a/docker/CentOS7.Dockerfile b/docker/CentOS7.Dockerfile
@@ -10,10 +10,10 @@ RUN yum install -y -q \
     centos-release-scl
 
 RUN yum install -y -q \
-    # for gcc-11
-    devtoolset-11-toolchain \
+    # for gcc-13
+    devtoolset-13-toolchain \
     # for ubsan
-    devtoolset-11-libubsan-devel \
+    devtoolset-13-libubsan-devel \
     # get a newer version of git and git-lfs
     # CentOS 7 comes with version 1.8.3.1 by default, which is from 2013!
     rh-git218 \
@@ -34,11 +34,11 @@ RUN yum install -y -q \
     xz-devel \
 
 # Create links to some of the custom packages
-RUN update-alternatives --install /usr/bin/gcc gcc /opt/rh/devtoolset-11/root/usr/bin/gcc 100 && \
-    update-alternatives --install /usr/bin/g++ g++ /opt/rh/devtoolset-11/root/usr/bin/g++ 100 && \
-    update-alternatives --install /usr/bin/cc cc /opt/rh/devtoolset-11/root/usr/bin/gcc 100 && \
-    update-alternatives --install /usr/bin/c++ c++ /opt/rh/devtoolset-11/root/usr/bin/g++ 100 && \
-    update-alternatives --install /usr/bin/gcov gcov /opt/rh/devtoolset-11/root/usr/bin/gcov 100 && \
+RUN update-alternatives --install /usr/bin/gcc gcc /opt/rh/devtoolset-13/root/usr/bin/gcc 100 && \
+    update-alternatives --install /usr/bin/g++ g++ /opt/rh/devtoolset-13/root/usr/bin/g++ 100 && \
+    update-alternatives --install /usr/bin/cc cc /opt/rh/devtoolset-13/root/usr/bin/gcc 100 && \
+    update-alternatives --install /usr/bin/c++ c++ /opt/rh/devtoolset-13/root/usr/bin/g++ 100 && \
+    update-alternatives --install /usr/bin/gcov gcov /opt/rh/devtoolset-13/root/usr/bin/gcov 100 && \
     update-alternatives --install /usr/bin/git git /opt/rh/rh-git218/root/usr/bin/git 100 && \
     update-alternatives --install /usr/bin/git-lfs git-lfs /opt/rh/rh-git218/root/usr/bin/git-lfs 100