From bbe7dbb0b8698395e34c0103f3917c8e7ba7154f Mon Sep 17 00:00:00 2001
From: Myk Taylor <myk002@yahoo.com>
Date: Mon, 31 Jul 2023 03:56:11 -0700
Subject: [PATCH] build with gcc 10 by default

---
 .github/workflows/build-linux.yml  |  2 +-
 .github/workflows/build.yml        |  3 +-
 .github/workflows/clean-cache.yml  |  1 +
 .github/workflows/steam-deploy.yml | 77 ++++++++++++++++--------------
 4 files changed, 43 insertions(+), 40 deletions(-)

diff --git a/.github/workflows/build-linux.yml b/.github/workflows/build-linux.yml
index b504403ee..b6c4e5aa5 100644
--- a/.github/workflows/build-linux.yml
+++ b/.github/workflows/build-linux.yml
@@ -34,7 +34,7 @@ on:
         default: false
       gcc-ver:
         type: string
-        default: "11"
+        default: "10"
 
 jobs:
   build-linux64:
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index f6116b3c9..e10894696 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -25,7 +25,7 @@ jobs:
   test-linux:
     name: Test (Linux, GCC ${{ matrix.gcc }}, ${{ matrix.plugins }} plugins)
     needs: build-linux
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-latest
     strategy:
       fail-fast: false
       matrix:
@@ -80,7 +80,6 @@ jobs:
       cache-id: release
       stonesense: true
       docs: true
-      gcc-ver: "10"
     secrets: inherit
 
   package-win64:
diff --git a/.github/workflows/clean-cache.yml b/.github/workflows/clean-cache.yml
index d3e12959d..0a4bddf64 100644
--- a/.github/workflows/clean-cache.yml
+++ b/.github/workflows/clean-cache.yml
@@ -1,4 +1,5 @@
 name: Clean up PR caches
+
 on:
   pull_request_target:
     types:
diff --git a/.github/workflows/steam-deploy.yml b/.github/workflows/steam-deploy.yml
index cbf311c7d..006c05ec1 100644
--- a/.github/workflows/steam-deploy.yml
+++ b/.github/workflows/steam-deploy.yml
@@ -30,58 +30,61 @@ jobs:
       stonesense: true
     secrets: inherit
 
-  depot-linux:
-    name: Linux depot files
-    uses: ./.github/workflows/build-linux.yml
+  depot-win64:
+    name: Windows depot files
+    uses: ./.github/workflows/build-windows.yml
     with:
-      artifact-name: linux64-depot
+      artifact-name: win64-depot
       ref: ${{ github.event.inputs.ref }}
       cache-id: release
       cache-readonly: true
       common-files: false
-      stonesense: true
-      gcc-ver: "10"
     secrets: inherit
 
-  depot-win64:
-    name: Windows depot files
-    uses: ./.github/workflows/build-windows.yml
+  depot-linux64:
+    name: Linux depot files
+    uses: ./.github/workflows/build-linux.yml
     with:
-      artifact-name: win64-depot
+      artifact-name: linux64-depot
       ref: ${{ github.event.inputs.ref }}
       cache-id: release
       cache-readonly: true
       common-files: false
+      stonesense: true
     secrets: inherit
 
   deploy-to-steam:
     name: Deploy to Steam
+    needs:
+    - depot-common
+    - depot-win64
+    - depot-linux64
     runs-on: ubuntu-latest
     steps:
-      - name: Stage common depot files
-        uses: actions/download-artifact@v3
-        with:
-          name: common-depot
-          path: common
-      - name: Stage linux64 depot files
-        uses: actions/download-artifact@v3
-        with:
-          name: linux64-depot
-          path: linux64
-      - name: Stage win64 depot files
-        uses: actions/download-artifact@v3
-        with:
-          name: win64-depot
-          path: win64
-      - name: Steam deploy
-        uses: game-ci/steam-deploy@v3
-        with:
-          username: ${{ secrets.STEAM_USERNAME }}
-          configVdf: ${{ secrets.STEAM_CONFIG_VDF}}
-          appId: 2346660
-          buildDescription: ${{ github.event.inputs.version }}
-          rootPath: build
-          depot1Path: common
-          depot2Path: win64
-          depot3Path: linux64
-          releaseBranch: ${{ github.event.inputs.release_channel }}
+    - name: Stage common depot files
+      uses: actions/download-artifact@v3
+      with:
+        name: common-depot
+        path: common
+    - name: Stage win64 depot files
+      uses: actions/download-artifact@v3
+      with:
+        name: win64-depot
+        path: win64
+    - name: Stage linux64 depot files
+      uses: actions/download-artifact@v3
+      with:
+        name: linux64-depot
+        path: linux64
+    - name: Steam deploy
+      uses: game-ci/steam-deploy@v3
+      with:
+        username: ${{ secrets.STEAM_USERNAME }}
+        configVdf: ${{ secrets.STEAM_CONFIG_VDF}}
+        appId: 2346660
+        buildDescription: ${{ github.event.inputs.version }}
+        rootPath: build
+        depot1Path: common
+        depot2Path: win64
+        depot3Path: linux64
+        releaseBranch: ${{ github.event.inputs.release_channel }}