From 73427de9946333adf31859aa91577a922ec10525 Mon Sep 17 00:00:00 2001
From: Myk Taylor <myk002@yahoo.com>
Date: Fri, 28 Jul 2023 16:16:36 -0700
Subject: [PATCH] build with gcc-10 for better system compat

---
 .github/workflows/build.yml | 11 ++++++++---
 .github/workflows/steam.yml |  9 +++++++--
 2 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 4caddc40a..82837ec32 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -132,6 +132,8 @@ jobs:
           sudo apt-get update
           sudo apt-get install \
               ccache \
+              gcc-10 \
+              g++-10 \
               libgl-dev \
               libxml-libxslt-perl \
               ninja-build
@@ -145,15 +147,18 @@ jobs:
         uses: actions/cache@v3
         with:
           path: ~/.ccache
-          key: ccache-ubuntu-22.04-gcc-11-${{ github.ref_name }}-${{ github.sha }}
+          key: ccache-ubuntu-22.04-gcc-10-${{ github.ref_name }}-${{ github.sha }}
           restore-keys: |
-            ccache-ubuntu-22.04-gcc-11-${{ github.ref_name }}
-            ccache-ubuntu-22.04-gcc-11
+            ccache-ubuntu-22.04-gcc-10-${{ github.ref_name }}
+            ccache-ubuntu-22.04-gcc-10
       - name: Set up environment
         id: env_setup
         run: |
           echo "CCACHE_DIR=${HOME}/.ccache" >> $GITHUB_ENV
       - name: Configure DFHack
+        env:
+          CC: gcc-10
+          CXX: g++-10
         run: |
           cmake \
             -S . \
diff --git a/.github/workflows/steam.yml b/.github/workflows/steam.yml
index c1118dddc..973f464bb 100644
--- a/.github/workflows/steam.yml
+++ b/.github/workflows/steam.yml
@@ -32,6 +32,8 @@ jobs:
           sudo apt-get update
           sudo apt-get install \
               ccache \
+              gcc-10 \
+              g++-10 \
               libgl-dev \
               libxml-libxslt-perl \
               ninja-build
@@ -53,9 +55,9 @@ jobs:
         uses: actions/cache@v3
         with:
           path: ~/.ccache
-          key: ccache-ubuntu-22.04-gcc-11-${{ github.sha }}
+          key: ccache-ubuntu-22.04-gcc-10-${{ github.sha }}
           restore-keys: |
-            ccache-ubuntu-22.04-gcc-11
+            ccache-ubuntu-22.04-gcc-10
       - name: Fetch win64 ccache
         uses: actions/cache@v3
         with:
@@ -68,6 +70,9 @@ jobs:
         run: |
           echo "CCACHE_DIR=${HOME}/.ccache" >> $GITHUB_ENV
       - name: Configure DFHack
+        env:
+          CC: gcc-10
+          CXX: g++-10
         run: |
           cmake \
             -S . \