From 299898d7e7f7bdf51cf59febf49fc9e69b9fca1c Mon Sep 17 00:00:00 2001
From: Nadia Holmquist Pedersen <nadia@nhp.sh>
Date: Thu, 1 Feb 2024 21:38:44 +0100
Subject: [PATCH] consolidate ubuntu jobs

---
 .github/workflows/build-ubuntu-aarch64.yml | 55 ----------------------
 .github/workflows/build-ubuntu.yml         | 37 ++++++++++++++-
 2 files changed, 36 insertions(+), 56 deletions(-)
 delete mode 100644 .github/workflows/build-ubuntu-aarch64.yml

diff --git a/.github/workflows/build-ubuntu-aarch64.yml b/.github/workflows/build-ubuntu-aarch64.yml
deleted file mode 100644
index 2a083f6d..00000000
--- a/.github/workflows/build-ubuntu-aarch64.yml
+++ /dev/null
@@ -1,55 +0,0 @@
-name: Ubuntu
-
-on:
-  push:
-    branches:
-      - master
-  pull_request:
-    branches:
-      - master
-
-env:
-  BUILD_TYPE: Release
-
-jobs:
-  build:
-    name: aarch64
-    runs-on: ubuntu-latest
-    container: ubuntu:22.04
-
-    steps:
-    - name: Prepare system
-      shell: bash
-      run: |
-        apt update
-        apt -y full-upgrade
-        apt -y install git
-    - name: Check out source
-      uses: actions/checkout@v1
-    - name: Install dependencies
-      shell: bash
-      run: |
-        dpkg --add-architecture arm64
-        sh -c "sed \"s|^deb \([a-z\.:/]*\) \([a-z\-]*\) \(.*\)$|deb [arch=amd64] \1 \2 \3\ndeb [arch=arm64] http://ports.ubuntu.com/ubuntu-ports \2 \3|\" /etc/apt/sources.list > /etc/apt/sources.list.new"
-        rm /etc/apt/sources.list
-        mv /etc/apt/sources.list{.new,}
-        apt update
-        DEBIAN_FRONTEND=noninteractive apt install -y {gcc-12,g++-12}-aarch64-linux-gnu {libsdl2,qt6-{base,base-private,multimedia},libslirp,libarchive,libzstd}-dev:arm64 pkg-config zstd:arm64 cmake extra-cmake-modules dpkg-dev
-    - name: Configure
-      shell: bash
-      run: |
-        cmake -B build \
-          -DPKG_CONFIG_EXECUTABLE=/usr/bin/aarch64-linux-gnu-pkg-config \
-          -DCMAKE_C_COMPILER=aarch64-linux-gnu-gcc-12 \
-          -DCMAKE_CXX_COMPILER=aarch64-linux-gnu-g++-12 \
-          -DUSE_QT6=ON
-    - name: Make
-      shell: bash
-      run: |
-        cmake --build build -j$(nproc --all)
-        mkdir dist
-        cp build/melonDS dist
-    - uses: actions/upload-artifact@v1
-      with:
-        name: melonDS-ubuntu-aarch64
-        path: dist
diff --git a/.github/workflows/build-ubuntu.yml b/.github/workflows/build-ubuntu.yml
index 65be8c59..6c29a639 100644
--- a/.github/workflows/build-ubuntu.yml
+++ b/.github/workflows/build-ubuntu.yml
@@ -9,7 +9,7 @@ on:
       - master
 
 jobs:
-  build:
+  build-x86_64:
     name: x86_64
     runs-on: ubuntu-22.04
 
@@ -46,3 +46,38 @@ jobs:
       with:
         name: melonDS-appimage-x86_64
         path: melonDS*.AppImage
+
+  build-aarch64:
+    name: aarch64
+    runs-on: ubuntu-latest
+    container: ubuntu:22.04
+
+    steps:
+      - name: Prepare system
+        run: |
+          dpkg --add-architecture arm64
+          sh -c "sed \"s|^deb \([a-z\.:/]*\) \([a-z\-]*\) \(.*\)$|deb [arch=amd64] \1 \2 \3\ndeb [arch=arm64] http://ports.ubuntu.com/ubuntu-ports \2 \3|\" /etc/apt/sources.list > /etc/apt/sources.list.new"
+          rm /etc/apt/sources.list
+          mv /etc/apt/sources.list{.new,}
+          apt update
+          apt -y full-upgrade
+          apt -y install git {gcc-12,g++-12}-aarch64-linux-gnu pkg-config cmake ninja-build extra-cmake-modules \
+            {libsdl2,qt6-{base,base-private,multimedia},libslirp,libarchive,libzstd}-dev:arm64
+      - name: Check out source
+        uses: actions/checkout@v4
+      - name: Configure
+        shell: bash
+        run: |
+          cmake -B build -G Ninja \
+            -DPKG_CONFIG_EXECUTABLE=/usr/bin/aarch64-linux-gnu-pkg-config \
+            -DCMAKE_C_COMPILER=aarch64-linux-gnu-gcc-12 \
+            -DCMAKE_CXX_COMPILER=aarch64-linux-gnu-g++-12 \
+            -DUSE_QT6=ON
+      - name: Build
+        shell: bash
+        run: |
+          cmake --build build
+      - uses: actions/upload-artifact@v4
+        with:
+          name: melonDS-ubuntu-aarch64
+          path: build/melonDS