From 2669ca3ba5485d3a8c3dfc58c3e76ea1f57b7f7c Mon Sep 17 00:00:00 2001
From: Gymnasiast <m.o.steenbeek@gmail.com>
Date: Thu, 22 May 2025 22:17:09 +0200
Subject: [PATCH] Build all graphics .dat in the same CI step

---
 .github/workflows/ci.yml | 29 +++++++++--------------------
 1 file changed, 9 insertions(+), 20 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 4fc1b80d67..20028d1637 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -150,7 +150,7 @@ jobs:
       - name: Run check-changelog-formatting
         run: scripts/check-changelog-formatting
   g2dat:
-    name: g2.dat and fonts.dat
+    name: Graphics .dat files
     runs-on: ubuntu-latest
     needs: build_variables
     steps:
@@ -164,22 +164,17 @@ jobs:
           mkdir -p "$GITHUB_WORKSPACE/bin"
           tar -C "$GITHUB_WORKSPACE/bin" -xf tools.tar.gz
           echo "$GITHUB_WORKSPACE/bin" >> $GITHUB_PATH
-      - name: Build g2.dat
+      - name: Build graphics .dat files
         run: |
           gxc build g2.dat OpenRCT2/resources/g2/sprites.json
-      - name: Build fonts.dat
-        run: |
           gxc build fonts.dat OpenRCT2/resources/fonts/sprites.json
-      - name: Upload g2.dat
+      - name: Upload graphics .dat files
         uses: actions/upload-artifact@v4
         with:
-          name: g2-${{ needs.build_variables.outputs.name }}.dat
-          path: g2.dat
-      - name: Upload fonts.dat
-        uses: actions/upload-artifact@v4
-        with:
-          name: fonts-${{ needs.build_variables.outputs.name }}.dat
-          path: fonts.dat
+          name: graphics-${{ needs.build_variables.outputs.name }}
+          path: |
+            g2.dat
+            fonts.dat
   windows:
     name: Windows
     runs-on: windows-latest
@@ -237,17 +232,11 @@ jobs:
         run: |
           mv files-signed/openrct2.com bin/openrct2.com
           mv files-signed/openrct2.exe bin/openrct2.exe
-      - name: Download g2.dat on ARM64
+      - name: Download graphics .dat files on ARM64
         if: matrix.platform == 'arm64'
         uses: actions/download-artifact@v4
         with:
-          name: g2-${{ needs.build_variables.outputs.name }}.dat
-          path: bin/data
-      - name: Download fonts.dat on ARM64
-        if: matrix.platform == 'arm64'
-        uses: actions/download-artifact@v4
-        with:
-          name: fonts-${{ needs.build_variables.outputs.name }}.dat
+          name: graphics-${{ needs.build_variables.outputs.name }}
           path: bin/data
       - name: Build artifacts
         run: |