From 7d32bcbb6b63411a9a0120c74ba79cedd02c6c35 Mon Sep 17 00:00:00 2001
From: falkTX <falktx@falktx.com>
Date: Sat, 22 Apr 2023 18:45:10 +0200
Subject: [PATCH] Cleanup

Signed-off-by: falkTX <falktx@falktx.com>
---
 .github/workflows/build.yml | 24 ++++++++++++++----------
 1 file changed, 14 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 007f85f..b161d12 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -31,7 +31,7 @@ jobs:
           sudo apt-get update -qq
           sudo apt-get install -yqq --allow-downgrades libgd3/focal libpcre2-8-0/focal libpcre2-16-0/focal libpcre2-32-0/focal libpcre2-posix2/focal
           sudo apt-get purge -yqq libclang* libgbm* libllvm* libmono* moby* mono* php* libgdiplus libpcre2-posix3 libzip4
-      - name: Set up dependencies
+      - name: Set up dependencies (aarch64)
         if: ${{ matrix.target == 'aarch64' }}
         run: |
           sudo dpkg --add-architecture arm64
@@ -41,7 +41,7 @@ jobs:
           echo "deb [arch=arm64] http://ports.ubuntu.com/ubuntu-ports focal-backports main restricted universe multiverse" | sudo tee -a /etc/apt/sources.list.d/ports-arm64.list
           sudo apt-get update -qq
           sudo apt-get install -yqq g++-aarch64-linux-gnu libasound2-dev:arm64 libdbus-1-dev:arm64 libgl1-mesa-dev:arm64 libglib2.0-dev:arm64 libx11-dev:arm64 libxcursor-dev:arm64 libxext-dev:arm64 libxrandr-dev:arm64 gperf qemu-user-static
-      - name: Set up dependencies
+      - name: Set up dependencies (armhf)
         if: ${{ matrix.target == 'armhf' }}
         run: |
           sudo dpkg --add-architecture armhf
@@ -51,14 +51,14 @@ jobs:
           echo "deb [arch=armhf] http://ports.ubuntu.com/ubuntu-ports focal-backports main restricted universe multiverse" | sudo tee -a /etc/apt/sources.list.d/ports-armhf.list
           sudo apt-get update -qq
           sudo apt-get install -yqq g++-arm-linux-gnueabihf libasound2-dev:armhf libdbus-1-dev:armhf libgl1-mesa-dev:armhf libglib2.0-dev:armhf libx11-dev:armhf libxcursor-dev:armhf libxext-dev:armhf libxrandr-dev:armhf gperf qemu-user-static
-      - name: Set up dependencies
+      - name: Set up dependencies (i386)
         if: ${{ matrix.target == 'i386' }}
         run: |
           sudo dpkg --add-architecture i386
           sudo apt-get update -qq
           sudo apt-get install -yqq g++-i686-linux-gnu libasound2-dev:i386 libdbus-1-dev:i386 libgl1-mesa-dev:i386 libglib2.0-dev:i386 libx11-dev:i386 libxcursor-dev:i386 libxext-dev:i386 libxrandr-dev:i386 gperf
           sudo apt-get install -yqq binutils-mingw-w64-i686 g++-mingw-w64-i686 mingw-w64 libwine-dev:i386 wine-stable wine64-tools
-      - name: Set up dependencies
+      - name: Set up dependencies (riscv64)
         if: ${{ matrix.target == 'riscv64' }}
         run: |
           sudo dpkg --add-architecture riscv64
@@ -68,7 +68,7 @@ jobs:
           echo "deb [arch=riscv64] http://ports.ubuntu.com/ubuntu-ports focal-backports main restricted universe multiverse" | sudo tee -a /etc/apt/sources.list.d/ports-riscv64.list
           sudo apt-get update -qq
           sudo apt-get install -yqq g++-riscv64-linux-gnu libasound2-dev:riscv64 libdbus-1-dev:riscv64 libgl1-mesa-dev:riscv64 libglapi-mesa:riscv64 libglvnd0:riscv64 libglib2.0-dev:riscv64 libx11-dev:riscv64 libxcursor-dev:riscv64 libxext-dev:riscv64 libxrandr-dev:riscv64 gperf qemu-user-static
-      - name: Set up dependencies
+      - name: Set up dependencies (x86_64)
         if: ${{ matrix.target == 'x86_64' }}
         run: |
           sudo dpkg --add-architecture i386
@@ -85,12 +85,16 @@ jobs:
           pushd PawPaw; source local.env linux-${{ matrix.target }}; popd
           make features
           make NOOPT=true -j $(nproc)
-      - name: Build linux x86_64 extra
+      - name: Build linux x86_64 extra (part1)
         if: ${{ matrix.target == 'x86_64' }}
         run: |
           pushd PawPaw; source local.env linux-${{ matrix.target }}; popd
-          make NOOPT=true extra-posix32 extra-win32 extra-win64 extra-wine64 -j $(nproc)
-          sudo apt-get install libwine-dev:i386
+          make NOOPT=true all extra-posix32 extra-win32 extra-win64 extra-wine64 -j $(nproc)
+      - name: Build linux x86_64 extra (part2)
+        if: ${{ matrix.target == 'x86_64' }}
+        run: |
+          sudo apt-get install -yqq libwine-dev:i386
+          pushd PawPaw; source local.env linux-${{ matrix.target }}; popd
           make NOOPT=true extra-wine32 -j $(nproc)
           make CARLA_EXTRA_TARGETS=true NOOPT=true -j $(nproc)
       - name: Set sha8
@@ -160,13 +164,13 @@ jobs:
           sudo apt-get update -qq
           sudo apt-get install -yqq --allow-downgrades libgd3/jammy
           sudo apt-get purge -yqq libmono* moby* mono* msbuild* php* libgdiplus libpcre2-posix3 nuget
-      - name: Set up dependencies
+      - name: Set up dependencies (win32)
         if: ${{ matrix.target == 'win32' }}
         run: |
           sudo dpkg --add-architecture i386
           sudo apt-get update -qq
           sudo apt-get install -yqq binutils-mingw-w64-i686 g++-mingw-w64-i686 gperf mingw-w64 wine-stable
-      - name: Set up dependencies
+      - name: Set up dependencies (win64)
         if: ${{ matrix.target == 'win64' }}
         run: |
           sudo dpkg --add-architecture i386