diff --git a/.github/workflows/update_docker_ci.yml b/.github/workflows/update_docker_ci.yml index 11e86e63..25ba3210 100644 --- a/.github/workflows/update_docker_ci.yml +++ b/.github/workflows/update_docker_ci.yml @@ -30,8 +30,8 @@ concurrency: env: CLANG_MAJOR_VERSION: 19 - GCC_MAJOR_VERSION: 12 - GCC_VERSION: 12.3.0 + GCC_MAJOR_VERSION: 14 + GCC_VERSION: 14.3.0 jobs: repo: diff --git a/docker/ci/README.md b/docker/ci/README.md index 558d1f1d..2955ae80 100644 --- a/docker/ci/README.md +++ b/docker/ci/README.md @@ -10,7 +10,7 @@ The image is based on Ubuntu 20.04 and contains: - ClangBuildAnalyzer 1.6.0 - Conan 2.17.0 - Doxygen 1.12 -- GCC 12.3.0 +- GCC 14.3.0 - gh 2.74 - git-cliff 2.9.1 - mold 2.40.1 diff --git a/docker/ci/conan/gcc.profile b/docker/ci/conan/gcc.profile index 61fd0f09..aeb26048 100644 --- a/docker/ci/conan/gcc.profile +++ b/docker/ci/conan/gcc.profile @@ -4,8 +4,8 @@ build_type=Release compiler=gcc compiler.cppstd=20 compiler.libcxx=libstdc++11 -compiler.version=12 +compiler.version=14 os=Linux [conf] -tools.build:compiler_executables={"c": "/usr/bin/gcc-12", "cpp": "/usr/bin/g++-12"} +tools.build:compiler_executables={"c": "/usr/bin/gcc-14", "cpp": "/usr/bin/g++-14"} diff --git a/docker/compilers/gcc/Dockerfile b/docker/compilers/gcc/Dockerfile index 46c358eb..672dd9ee 100644 --- a/docker/compilers/gcc/Dockerfile +++ b/docker/compilers/gcc/Dockerfile @@ -8,7 +8,7 @@ ARG UBUNTU_VERSION ARG GCC_MAJOR_VERSION -ARG BUILD_VERSION=7 +ARG BUILD_VERSION=0 ARG DEBIAN_FRONTEND=noninteractive ARG TARGETARCH diff --git a/docker/compilers/gcc/control.m4 b/docker/compilers/gcc/control.m4 index 050fec61..5082c6c3 100644 --- a/docker/compilers/gcc/control.m4 +++ b/docker/compilers/gcc/control.m4 @@ -1,4 +1,4 @@ -Package: gcc-12-ubuntu-UBUNTUVERSION +Package: gcc-14-ubuntu-UBUNTUVERSION Version: VERSION Architecture: TARGETARCH Maintainer: Alex Kremer