From 93f0a6d23ebed50833f565f949f351c2b80853ac Mon Sep 17 00:00:00 2001
From: spicyjpeg <88942473+spicyjpeg@users.noreply.github.com>
Date: Mon, 7 Mar 2022 22:17:50 +0100
Subject: Fix critical ldscript bug and CI, add BIOS setjmp

---
 .github/workflows/build.yml | 28 +++++++++-------------------
 1 file changed, 9 insertions(+), 19 deletions(-)

(limited to '.github/workflows')

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index b2ca311..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
@@ -83,25 +86,19 @@ jobs:
 
   # No surprises here either. The GitHub Actions VMs even come with most of the
   # dependencies required to build PSn00bSDK preinstalled.
-  # NOTE: the workaround to allow the toolchain cache to be loaded (see below)
-  # doesn't seem to work on Windows Server 2022 currently.
   build-sdk-windows:
     name:    Build PSn00bSDK on Windows
-    runs-on: windows-2019
+    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
@@ -118,7 +115,7 @@ jobs:
 
     - name: Build and package PSn00bSDK
       run: |
-        cmake --preset ci -S sdk -G "Visual Studio 16 2019" -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
 
@@ -144,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
@@ -178,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:
@@ -194,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
@@ -236,4 +227,3 @@ jobs:
           psn00bsdk-windows-nsis/*
           psn00bsdk-linux/*
           psn00bsdk-linux-deb/*
-          psn00bsdk-linux-rpm/*
-- 
cgit v1.2.3