From 28766d18797b2c0aee2ac3bb4b12334b5afa51d5 Mon Sep 17 00:00:00 2001
From: Desour <ds.desour@proton.me>
Date: Sun, 11 Jun 2023 21:49:30 +0200
Subject: [PATCH] Bump minimum gcc and clang versions

---
 .github/workflows/build.yml | 22 ++++++++++------------
 CMakeLists.txt              |  4 ++--
 doc/compiling/linux.md      |  2 +-
 3 files changed, 13 insertions(+), 15 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 32f458819..7d6306241 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -34,22 +34,21 @@ env:
 
 jobs:
   # Older gcc version (should be close to our minimum supported version)
-  gcc_5:
-    runs-on: ubuntu-18.04
-    if: "false" # FIXME
+  gcc_7:
+    runs-on: ubuntu-20.04
     steps:
       - uses: actions/checkout@v3
       - name: Install deps
         run: |
           source ./util/ci/common.sh
-          install_linux_deps g++-5
+          install_linux_deps g++-7
 
       - name: Build
         run: |
           ./util/ci/build.sh
         env:
-          CC: gcc-5
-          CXX: g++-5
+          CC: gcc-7
+          CXX: g++-7
 
       - name: Test
         run: |
@@ -77,22 +76,21 @@ jobs:
           ./bin/minetest --run-unittests
 
   # Older clang version (should be close to our minimum supported version)
-  clang_3_9:
-    runs-on: ubuntu-18.04
-    if: "false" # FIXME
+  clang_6_0:
+    runs-on: ubuntu-20.04
     steps:
       - uses: actions/checkout@v3
       - name: Install deps
         run: |
           source ./util/ci/common.sh
-          install_linux_deps clang-3.9 valgrind
+          install_linux_deps clang-6.0 valgrind
 
       - name: Build
         run: |
           ./util/ci/build.sh
         env:
-          CC: clang-3.9
-          CXX: clang++-3.9
+          CC: clang-6.0
+          CXX: clang++-6.0
 
       - name: Unittest
         run: |
diff --git a/CMakeLists.txt b/CMakeLists.txt
index c4837f988..633152b62 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -13,8 +13,8 @@ set(PROJECT_NAME_CAPITALIZED "Minetest")
 
 set(CMAKE_CXX_STANDARD 14)
 set(CMAKE_CXX_STANDARD_REQUIRED TRUE)
-set(GCC_MINIMUM_VERSION "5.1")
-set(CLANG_MINIMUM_VERSION "3.5")
+set(GCC_MINIMUM_VERSION "7.5")
+set(CLANG_MINIMUM_VERSION "6.0")
 
 # You should not need to edit these manually, use util/bump_version.sh
 set(VERSION_MAJOR 5)
diff --git a/doc/compiling/linux.md b/doc/compiling/linux.md
index 32d5d3550..20c562148 100644
--- a/doc/compiling/linux.md
+++ b/doc/compiling/linux.md
@@ -4,7 +4,7 @@
 
 | Dependency | Version | Commentary |
 |------------|---------|------------|
-| GCC        | 5.1+    | or Clang 3.5+ |
+| GCC        | 7.5+    | or Clang 6.0+ |
 | CMake      | 3.5+    |            |
 | IrrlichtMt | -       | Custom version of Irrlicht, see https://github.com/minetest/irrlicht |
 | Freetype   | 2.0+    |            |