From f97ae19371466061a55b853d77099324359b6d92 Mon Sep 17 00:00:00 2001 From: Matthias Koeppe Date: Thu, 22 Jun 2023 13:58:23 -0700 Subject: [PATCH 1/5] Drop support for GCC < 8.4, drop testing of debian-buster and fedora-29 --- .github/workflows/docker.yml | 4 ---- README.md | 4 ++-- build/pkgs/gcc/SPKG.rst | 4 ++-- build/pkgs/gcc/spkg-configure.m4 | 4 ++-- 4 files changed, 6 insertions(+), 10 deletions(-) diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index aa276e590fe..d8799af9e2d 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -24,11 +24,9 @@ on: "ubuntu-kinetic", "ubuntu-lunar", "ubuntu-mantic", - "debian-buster", "debian-bullseye", "debian-bookworm", "debian-sid", - "linuxmint-19-gcc_8-python3.8", "linuxmint-19.3-gcc_8-python3.8", "linuxmint-20.1", "linuxmint-20.2", @@ -36,7 +34,6 @@ on: "linuxmint-21", "linuxmint-21.1", "linuxmint-21.2", - "fedora-29-python3.8", "fedora-30-python3.8", "fedora-31", "fedora-32", @@ -59,7 +56,6 @@ on: "opensuse-tumbleweed-python3.10", "conda-forge", "ubuntu-bionic-gcc_8-i386", - "debian-buster-i386", "debian-bullseye-i386", ] tox_packages_factors: diff --git a/README.md b/README.md index f086349a015..5ea49c287ee 100644 --- a/README.md +++ b/README.md @@ -189,8 +189,8 @@ in the Installation Guide. 3. [Linux, WSL] Install the required minimal build prerequisites. - - Compilers: `gcc`, `gfortran`, `g++` (GCC 8.x to 12.x and recent - versions of Clang (LLVM) are supported). + - Compilers: `gcc`, `gfortran`, `g++` (GCC versions from 8.4.0 to 13.x + and recent versions of Clang (LLVM) are supported). See [build/pkgs/gcc/SPKG.rst](build/pkgs/gcc/SPKG.rst) and [build/pkgs/gfortran/SPKG.rst](build/pkgs/gfortran/SPKG.rst) for a discussion of suitable compilers. diff --git a/build/pkgs/gcc/SPKG.rst b/build/pkgs/gcc/SPKG.rst index 75feee2d6d8..1f90eb0bf67 100644 --- a/build/pkgs/gcc/SPKG.rst +++ b/build/pkgs/gcc/SPKG.rst @@ -6,7 +6,7 @@ Description This package represents the required C and C++ compilers. -- GCC (GNU Compiler Collection) versions 8.x to 12.x are supported. +- GCC (GNU Compiler Collection) versions 8.x (>= 8.4.0) to 13.x are supported. - Clang (LLVM) is also supported. @@ -25,7 +25,7 @@ need to run:: Vendor and versions of the C and C++ compilers should match. Users of older Linux distributions (in particular, ``ubuntu-xenial`` -or older, ``debian-stretch`` or older, ``linuxmint-18`` or older) +or older, ``debian-buster`` or older, ``linuxmint-18`` or older) should upgrade their systems before attempting to install Sage from source. Users of ``ubuntu-bionic``, ``linuxmint-19.x``, and ``opensuse-15.x`` can install a versioned ``gcc`` system package diff --git a/build/pkgs/gcc/spkg-configure.m4 b/build/pkgs/gcc/spkg-configure.m4 index 34953c32302..e1b44ec1c9d 100644 --- a/build/pkgs/gcc/spkg-configure.m4 +++ b/build/pkgs/gcc/spkg-configure.m4 @@ -161,8 +161,8 @@ SAGE_SPKG_CONFIGURE_BASE([gcc], [ # Add the .0 because Debian/Ubuntu gives version numbers like # 4.6 instead of 4.6.4 (Trac #18885) AS_CASE(["$GXX_VERSION.0"], - [[[0-7]].*], [ - # Install our own GCC if the system-provided one is older than gcc 8 + [[[0-7]].*|8.[[0-3]].*], [ + # Install our own GCC if the system-provided one is older than gcc 8.4 SAGE_SHOULD_INSTALL_GCC([you have $CXX version $GXX_VERSION, which is quite old]) ], [1[[4-9]].*], [ From 9fa022d4ea20b6303181626bad3d7c0d34c99f3e Mon Sep 17 00:00:00 2001 From: Matthias Koeppe Date: Mon, 21 Aug 2023 17:07:55 -0700 Subject: [PATCH 2/5] .github/workflows/docker.yml: Add debian-buster-gcc_spkg --- .github/workflows/docker.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index d8799af9e2d..ac556ce8348 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -24,6 +24,7 @@ on: "ubuntu-kinetic", "ubuntu-lunar", "ubuntu-mantic", + "debian-buster-gcc_spkg", "debian-bullseye", "debian-bookworm", "debian-sid", From 941bceb82c5d8352f6afe109e790c26c130a6f32 Mon Sep 17 00:00:00 2001 From: Matthias Koeppe Date: Mon, 21 Aug 2023 20:02:50 -0700 Subject: [PATCH 3/5] .github/workflows/docker.yml: Remove linuxmint-19.3-gcc_8-python3.8 --- .github/workflows/docker.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index ac556ce8348..36e68916dc7 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -28,7 +28,6 @@ on: "debian-bullseye", "debian-bookworm", "debian-sid", - "linuxmint-19.3-gcc_8-python3.8", "linuxmint-20.1", "linuxmint-20.2", "linuxmint-20.3", From 16cf9647ada45e1b43f16ce9091252b389634011 Mon Sep 17 00:00:00 2001 From: Matthias Koeppe Date: Mon, 21 Aug 2023 20:06:39 -0700 Subject: [PATCH 4/5] .github/workflows/docker.yml: Change fedora-30-python3.8 to fedora-30 to prevent merge conflict with #35404 --- .github/workflows/docker.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index 36e68916dc7..dadbda9371a 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -34,7 +34,7 @@ on: "linuxmint-21", "linuxmint-21.1", "linuxmint-21.2", - "fedora-30-python3.8", + "fedora-30", "fedora-31", "fedora-32", "fedora-33", From 8436612a1bd692682b7a9c313aa356609d75552e Mon Sep 17 00:00:00 2001 From: Matthias Koeppe Date: Mon, 21 Aug 2023 22:25:09 -0700 Subject: [PATCH 5/5] tox.ini, .github/workflows/docker.yml: Add debian-trixie --- .github/workflows/docker.yml | 1 + tox.ini | 1 + 2 files changed, 2 insertions(+) diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index dadbda9371a..4b7c37a057c 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -27,6 +27,7 @@ on: "debian-buster-gcc_spkg", "debian-bullseye", "debian-bookworm", + "debian-trixie", "debian-sid", "linuxmint-20.1", "linuxmint-20.2", diff --git a/tox.ini b/tox.ini index c5591c5a546..5eeb1c40943 100644 --- a/tox.ini +++ b/tox.ini @@ -238,6 +238,7 @@ setenv = debian-bullseye: BASE_TAG=bullseye debian-bullseye: IGNORE_MISSING_SYSTEM_PACKAGES=yes debian-bookworm: BASE_TAG=bookworm + debian-trixie: BASE_TAG=trixie debian-sid: BASE_TAG=sid # # https://hub.docker.com/u/linuxmintd