From 3654e29d247bc28735bf34d757736e7922fbba68 Mon Sep 17 00:00:00 2001
From: Spencer Brown <spencerb21@live.com>
Date: Fri, 23 Feb 2024 14:41:48 +1000
Subject: [PATCH] Bump CI versions, split engine FGD dump into its own job

---
 .github/workflows/build-fgds.yml         | 31 +++++++++++++++++++-----
 .github/workflows/build-postcompiler.yml |  9 ++++---
 2 files changed, 30 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/build-fgds.yml b/.github/workflows/build-fgds.yml
index 67742524..b15a742a 100644
--- a/.github/workflows/build-fgds.yml
+++ b/.github/workflows/build-fgds.yml
@@ -18,11 +18,12 @@ permissions:
 jobs:
   build-fgds:
     runs-on: ubuntu-latest
+    name: Build FGDs
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: Setup Python
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v5
         with:
           python-version: '3.11'
           cache: 'pip'
@@ -31,13 +32,31 @@ jobs:
         run: python -m pip install -r requirements.txt
       - name: FGD build and folder copy
         run: bash ./build.sh all
+      - name: Artifact upload
+        uses: actions/upload-artifact@v4
+        with:
+          name: build-${{ github.sha }}
+          path: ./build/*.fgd
+          if-no-files-found: error
+  build-engine:
+    runs-on: ubuntu-latest
+    name: Build Engine Dump
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+      - name: Setup Python
+        uses: actions/setup-python@v5
+        with:
+          python-version: '3.11'
+          cache: 'pip'
+          cache-dependency-path: 'requirements.txt'
+      - name: Install srctools
+        run: python -m pip install -r requirements.txt
       - name: FGD engine dump
         run: python src/hammeraddons/unify_fgd.py exp --engine --binary -o build/fgd.lzma
       - name: Artifact upload
         uses: actions/upload-artifact@v4
         with:
-          name: build-${{ github.sha }}
-          path: |
-            ./build/*.fgd
-            ./build/fgd.lzma
+          name: build-engine-${{ github.sha }}
+          path: ./build/fgd.lzma
           if-no-files-found: error
diff --git a/.github/workflows/build-postcompiler.yml b/.github/workflows/build-postcompiler.yml
index d79261c6..cdf6c7b1 100644
--- a/.github/workflows/build-postcompiler.yml
+++ b/.github/workflows/build-postcompiler.yml
@@ -37,27 +37,28 @@ jobs:
             arch: 'x64'
             os: 'ubuntu-latest'
     runs-on: ${{ matrix.os }}
+    name: Build postcompiler-${{ artifact-name }}
     steps:
       # Build dev on schedule, since it's actually changing.
       - name: Checkout Dev
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         if: github.event_name == 'schedule'
         with:
           ref: dev
       # Always build the exact tag that's pushed.
       - name: Checkout Tag
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         if: github.event_name == 'create'
         with:
           ref: ${{ github.event.ref }}
       - name: Checkout Ref
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         if: github.event_name == 'workflow_dispatch'
         with:
           ref: ${{ inputs.ref }}
 
       - name: Set up Python ${{ matrix.python-version }}-${{ matrix.arch }}
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v5
         with:
           python-version: ${{ matrix.python-version }}
           architecture: ${{ matrix.arch }}