From e4e6d4c5508dcb1c8e069249935085b5b444f3c7 Mon Sep 17 00:00:00 2001
From: Schnappy <ABelliqueux@users.noreply.github.com>
Date: Tue, 2 Nov 2021 11:56:56 +0100
Subject: [PATCH] Update macos-build.yml

---
 .github/workflows/macos-build.yml | 75 ++++++++++++++-----------------
 1 file changed, 33 insertions(+), 42 deletions(-)

diff --git a/.github/workflows/macos-build.yml b/.github/workflows/macos-build.yml
index dc4f54b..6fd8006 100644
--- a/.github/workflows/macos-build.yml
+++ b/.github/workflows/macos-build.yml
@@ -1,50 +1,41 @@
-name: macOS toolchain CI
+name: macOS build
 
 on:
   push:
-    branches:
-      - main
-  pull_request:
+    branches: [ main ]
 
 jobs:
-  macos-build-and-test-toolchain:
-
+  build:
     runs-on: macOS-latest
 
     steps:
-    - uses: actions/checkout@v2
-    - name: Fetch submodules
-      run: git submodule update --init --recursive
-
-
-steps:
-    - uses: actions/checkout@v2
-    - name: Fetch submodules
-      run: git submodule update --init --recursive 
-    - name: Install cmake
-      run : |
-        brew install tinyxml2
-    - name: Install mipsel toolchain
-      run: |
-        wget https://github.com/grumpycoders/pcsx-redux/blob/a899d09d81cf602ef48e51cda09a6c62638fa5c5/tools/macos-mips/mipsel-none-elf-binutils.rb -O ${{github.workspace}}/mipsel-none-elf-binutils.rb
-        wget https://github.com/grumpycoders/pcsx-redux/blob/a899d09d81cf602ef48e51cda09a6c62638fa5c5/tools/macos-mips/mipsel-none-elf-gcc.rb -O ${{github.workspace}}/mipsel-none-elf-gcc.rb
-        brew install ${{github.workspace}}/mipsel-none-elf-binutils.rb --debug
-        brew install ${{github.workspace}}/mipsel-none-elf-gcc.rb --debug
-    - name: Clone mkpsxiso
-      uses: GuillaumeFalourd/clone-github-repo-action@v1
-      with:
-        owner: 'Lameguy64'
-        repository: 'mkpsxiso'
-    - name: Build mkpsxiso
-      run: |
-        sudo chown -R runner:docker ${{github.workspace}}/mkpsxiso/
-        mkdir ${{github.workspace}}/mkpsxiso/build
-        cmake -DCMAKE_BUILD_TYPE=Release -S ${{github.workspace}}/mkpsxiso/ -B ${{github.workspace}}/mkpsxiso/build
-        cmake --build ${{github.workspace}}/mkpsxiso/build
-        echo "${{github.workspace}}/mkpsxiso/build" >> $GITHUB_PATH
-    - name: Get converted libs
-      run: |
-        wget http://psx.arthus.net/sdk/Psy-Q/psyq-4.7-converted-full.7z
-        7z x psyq-4.7-converted-full.7z -o./psyq
-    - name: Make all
-      run: make all
+      - uses: actions/checkout@v2
+      - name: Fetch submodules
+        run: git submodule update --init --recursive 
+      - name: Install cmake
+        run : |
+          brew install tinyxml2
+      - name: Install mipsel toolchain
+        run: |
+          wget https://github.com/grumpycoders/pcsx-redux/blob/a899d09d81cf602ef48e51cda09a6c62638fa5c5/tools/macos-mips/mipsel-none-elf-binutils.rb -O ${{github.workspace}}/mipsel-none-elf-binutils.rb
+          wget https://github.com/grumpycoders/pcsx-redux/blob/a899d09d81cf602ef48e51cda09a6c62638fa5c5/tools/macos-mips/mipsel-none-elf-gcc.rb -O ${{github.workspace}}/mipsel-none-elf-gcc.rb
+          brew install ${{github.workspace}}/mipsel-none-elf-binutils.rb --debug
+          brew install ${{github.workspace}}/mipsel-none-elf-gcc.rb --debug
+      - name: Clone mkpsxiso
+        uses: GuillaumeFalourd/clone-github-repo-action@v1
+        with:
+          owner: 'Lameguy64'
+          repository: 'mkpsxiso'
+      - name: Build mkpsxiso
+        run: |
+          sudo chown -R runner:docker ${{github.workspace}}/mkpsxiso/
+          mkdir ${{github.workspace}}/mkpsxiso/build
+          cmake -DCMAKE_BUILD_TYPE=Release -S ${{github.workspace}}/mkpsxiso/ -B ${{github.workspace}}/mkpsxiso/build
+          cmake --build ${{github.workspace}}/mkpsxiso/build
+          echo "${{github.workspace}}/mkpsxiso/build" >> $GITHUB_PATH
+      - name: Get converted libs
+        run: |
+          wget http://psx.arthus.net/sdk/Psy-Q/psyq-4.7-converted-full.7z
+          7z x psyq-4.7-converted-full.7z -o./psyq
+      - name: Make all
+        run: make all