Merge pull request #46 from spicyjpeg/psxmdec

Critical ldscript fixes, initial MDEC support and CI updates

1 files changed, 15 insertions, 31 deletions

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index a72f5d3..6f42e41 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -16,6 +16,9 @@ env:
 
 jobs:
   # This is based on doc/toolchain.md, no surprises here other than the cache.
+  # Since actions/cache@v2 has bugs when restoring on Windows caches created on
+  # Linux, v1 is used instead.
+  # https://github.com/actions/cache/issues/576
   build-gcc:
     name:    Build GCC toolchain
     runs-on: ubuntu-latest
@@ -23,7 +26,7 @@ jobs:
     steps:
     - name: Initialize toolchain cache
       id:   _cache
-      uses: actions/cache@v2
+      uses: actions/cache@v1
       with:
         key:  gcc-${{ env.GCC_TARGET }}-${{ env.GCC_VERSION }}
         path: gcc
@@ -85,42 +88,34 @@ jobs:
   # dependencies required to build PSn00bSDK preinstalled.
   build-sdk-windows:
     name:    Build PSn00bSDK on Windows
-    runs-on: windows-latest
+    runs-on: windows-2022
     needs:   build-gcc
 
     steps:
-      # Due to a bug in the cache action (and in order to use Ninja and pacman)
-      # the directories MSys2 stores binaries in must be added to PATH. For
-      # some reason they are not present in PATH by default.
-      # https://github.com/actions/cache/issues/576
     - name: Add MSys2 to PATH
       run: |
         echo "C:\msys64\mingw64\bin" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
         echo "C:\msys64\usr\bin" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
 
     - name: Initialize toolchain cache
-      uses: actions/cache@v2
+      uses: actions/cache@v1
       with:
         key:  gcc-${{ env.GCC_TARGET }}-${{ env.GCC_VERSION }}
         path: gcc
 
     - name: Install prerequisites
       run: |
-        pacman -S --noconfirm mingw-w64-x86_64-ninja mingw-w64-x86_64-gcc
+        pacman -S --noconfirm mingw-w64-x86_64-ninja
 
     - name: Fetch repo contents
       uses: actions/checkout@v2
       with:
-        path: sdk
-
-    - name: Update repo submodules
-      run: |
-        cd sdk
-        git submodule update --init --recursive
+        path:       sdk
+        submodules: recursive
 
     - name: Build and package PSn00bSDK
       run: |
-        cmake --preset ci -S sdk -DPSN00BSDK_TC=${{ github.workspace }}\gcc\windows
+        cmake --preset ci -S sdk -G "Visual Studio 17 2022" -DPSN00BSDK_TC=${{ github.workspace }}\gcc\windows
         cmake --build build
         cmake --build build -t package
 
@@ -146,7 +141,7 @@ jobs:
 
     steps:
     - name: Initialize toolchain cache
-      uses: actions/cache@v2
+      uses: actions/cache@v1
       with:
         key:  gcc-${{ env.GCC_TARGET }}-${{ env.GCC_VERSION }}
         path: gcc
@@ -159,16 +154,12 @@ jobs:
     - name: Fetch repo contents
       uses: actions/checkout@v2
       with:
-        path: sdk
-
-    - name: Update repo submodules
-      run: |
-        cd sdk
-        git submodule update --init --recursive
+        path:       sdk
+        submodules: recursive
 
     - name: Build and package PSn00bSDK
       run: |
-        cmake --preset ci -S sdk -DPSN00BSDK_TC=${{ github.workspace }}/gcc/linux
+        cmake --preset ci -S sdk -G "Ninja" -DPSN00BSDK_TC=${{ github.workspace }}/gcc/linux
         cmake --build build
         cmake --build build -t package
 
@@ -184,12 +175,6 @@ jobs:
         name: psn00bsdk-linux-deb
         path: build/packages/*.deb
 
-    - name: Upload build artifacts (RPM)
-      uses: actions/upload-artifact@v2
-      with:
-        name: psn00bsdk-linux-rpm
-        path: build/packages/*.rpm
-
   # This job takes care of creating a new release and upload the build
   # artifacts if the last commit is associated to a tag.
   create-release:
@@ -200,7 +185,7 @@ jobs:
     steps:
     - name: Initialize toolchain cache
       if:   ${{ github.ref_type == 'tag' }}
-      uses: actions/cache@v2
+      uses: actions/cache@v1
       with:
         key:  gcc-${{ env.GCC_TARGET }}-${{ env.GCC_VERSION }}
         path: gcc
@@ -242,4 +227,3 @@ jobs:
           psn00bsdk-windows-nsis/*
           psn00bsdk-linux/*
           psn00bsdk-linux-deb/*
-          psn00bsdk-linux-rpm/*