From 54c70c2012b9bfaed0ff62dd00e816ec913be52e Mon Sep 17 00:00:00 2001
From: animetosho <animetosho@users.noreply.github.com>
Date: Thu, 25 Jan 2024 07:10:56 +1000
Subject: [PATCH] Try Github Actions build fixes

---
 .github/workflows/build-dev-linux.yml | 56 +++++++++++++++++++++++++++
 .github/workflows/build-dev-mac.yml   |  5 ++-
 .github/workflows/build-dev-win32.yml |  2 +-
 .github/workflows/build.yml           | 12 ++++--
 4 files changed, 69 insertions(+), 6 deletions(-)
 create mode 100644 .github/workflows/build-dev-linux.yml

diff --git a/.github/workflows/build-dev-linux.yml b/.github/workflows/build-dev-linux.yml
new file mode 100644
index 0000000..634630a
--- /dev/null
+++ b/.github/workflows/build-dev-linux.yml
@@ -0,0 +1,56 @@
+name: Build dev Linux binary
+on:
+  workflow_dispatch:
+
+jobs:
+  build-dev-linux:
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+        - target: x86_64-linux-musl
+          arch: x64
+          xz_bcj: --x86
+          name: amd64
+        - target: aarch64-linux-musl
+          arch: arm64
+          xz_bcj: 
+          name: aarch64
+        # disabled due to compiler crashing
+        #- target: armv7l-linux-musleabihf
+        #  arch: arm
+        #  xz_bcj: --arm
+        #  name: armhf
+    name: Build ${{ matrix.name }} dev Linux binary
+    runs-on: ubuntu-latest
+    env:
+      BUILD_ARCH: ${{ matrix.arch }}
+      BUILD_LOGLEVEL: verbose
+      BUILD_CONFIGURE: '--with-arm-float-abi=hard --with-arm-fpu=vfpv3-d16'
+    steps:
+      - uses: actions/checkout@v3
+      - uses: Lesmiscore/musl-cross-compilers@jockie
+        id: musl
+        with:
+          target: ${{ matrix.target }}
+      - name: Install i386 dev
+        run: |
+          sudo dpkg --add-architecture i386
+          sudo apt update
+          sudo apt install -y libstdc++-$(c++ -dumpversion)-dev:i386 libc6-dev:i386 g++-multilib
+        if: ${{ matrix.arch == 'arm' }}
+      - run: npm install --production
+      - run: (cd nexe && npm install --production)
+      - run: (cd nexe && node build)
+        env:
+          CC: ${{ steps.musl.outputs.path }}/${{ matrix.target }}-cc
+          CXX: ${{ steps.musl.outputs.path }}/${{ matrix.target }}-c++
+          CC_host: cc
+          CXX_host: c++
+      - run: ${{ steps.musl.outputs.path }}/${{ matrix.target }}-strip nexe/nyuu
+      - run: tar --group=nobody --owner=nobody -cf - -C nexe nyuu ../config-sample.json | xz -9e ${{ matrix.xz_bcj }} --lzma2 > nyuu.txz
+      - uses: actions/upload-artifact@v3
+        with:
+          path: ./nyuu.txz
+          name: nyuu-${{ github.ref_name }}-linux-${{ matrix.name }}.7z
+          retention-days: 5
diff --git a/.github/workflows/build-dev-mac.yml b/.github/workflows/build-dev-mac.yml
index 29f9a2c..d5f833a 100644
--- a/.github/workflows/build-dev-mac.yml
+++ b/.github/workflows/build-dev-mac.yml
@@ -3,7 +3,7 @@ on:
   workflow_dispatch:
 
 jobs:
-  build-mac:
+  build-dev-mac:
     name: Build x64 MacOS binary
     runs-on: macos-latest
     env:
@@ -11,6 +11,9 @@ jobs:
       BUILD_LOGLEVEL: verbose
     steps:
       - uses: actions/checkout@v3
+      - uses: MatteoH2O1999/setup-python@v3
+        with:
+          python-version: '3.11'
       - run: npm install --production
       - run: (cd nexe && npm install --production)
       - run: (cd nexe && node build)
diff --git a/.github/workflows/build-dev-win32.yml b/.github/workflows/build-dev-win32.yml
index f7f2c53..373ceb2 100644
--- a/.github/workflows/build-dev-win32.yml
+++ b/.github/workflows/build-dev-win32.yml
@@ -3,7 +3,7 @@ on:
   workflow_dispatch:
 
 jobs:
-  build-win32:
+  build-dev-win32:
     name: Build x86 Windows binary
     runs-on: windows-2019
     env:
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index dd27557..9750eae 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -39,6 +39,7 @@ jobs:
   
   build-linux:
     strategy:
+      fail-fast: false
       matrix:
         include:
         - target: x86_64-linux-musl
@@ -68,10 +69,10 @@ jobs:
           target: ${{ matrix.target }}
       - name: Install i386 dev
         run: |
-          dpkg --add-architecture i386
-          apt update
-          apt install -y libstdc++-$(c++ -dumpversion)-dev:i386 libc6-dev:i386 g++-multilib
-        if: ${{ matrix.arch }} == 'arm'
+          sudo dpkg --add-architecture i386
+          sudo apt update
+          sudo apt install -y libstdc++-$(c++ -dumpversion)-dev:i386 libc6-dev:i386 g++-multilib
+        if: ${{ matrix.arch == 'arm' }}
       - name: Get release
         id: get_release
         uses: bruceadams/get-release@v1.2.3
@@ -104,6 +105,9 @@ jobs:
       BUILD_LOGLEVEL: verbose
     steps:
       - uses: actions/checkout@v3
+      - uses: MatteoH2O1999/setup-python@v3
+        with:
+          python-version: '3.11'
       - name: Get release
         id: get_release
         uses: bruceadams/get-release@v1.2.3