From 6a4ad7c0a47581acde0e2442ecebd9327cf9cde8 Mon Sep 17 00:00:00 2001
From: Margen67 <Margen67@users.noreply.github.com>
Date: Fri, 18 Feb 2022 23:45:30 -0800
Subject: [PATCH] Add game patches to Canary artifacts+release

Also add release for canary_experimental+pr
---
 .github/workflows/CI.yml | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml
index 48158ffc3..6463073b9 100644
--- a/.github/workflows/CI.yml
+++ b/.github/workflows/CI.yml
@@ -2,7 +2,7 @@ name: CI
 
 on:
   push:
-    branches-ignore: [ gh-pages, master, canary_base ]
+    branches-ignore: [ gh-pages, master ]
     paths-ignore:
       - '.github/*'
       - '.github/*_TEMPLATE/**'
@@ -31,10 +31,10 @@ jobs:
       matrix:
         runs-on: [windows-2019, windows-latest]
         include:
-          - runs-on: windows-latest
-            vsver: VS2022
           - runs-on: windows-2019
             vsver: VS2019
+          - runs-on: windows-latest
+            vsver: VS2022
     steps:
       - uses: actions/checkout@v2
         with:
@@ -48,6 +48,8 @@ jobs:
           robocopy . build\bin\${{ runner.os }}\Release                                                                LICENSE /r:0 /w:0
           robocopy   build\bin\${{ runner.os }}\Release artifacts\xenia_canary   xenia_canary.exe   xenia_canary.pdb   LICENSE /r:0 /w:0
           robocopy   build\bin\${{ runner.os }}\Release artifacts\xenia-vfs-dump xenia-vfs-dump.exe xenia-vfs-dump.pdb LICENSE /r:0 /w:0
+          curl -fLJO https://github.com/xenia-canary/game-patches/archive/refs/heads/main.zip
+          7z e game-patches-main.zip game-patches-main\patches -oartifacts\xenia_canary\patches
           If ($LastExitCode -le 7) { echo "LastExitCode = $LastExitCode";$LastExitCode = 0 }
       - name: Upload xenia-vfs-dump artifacts
         uses: actions/upload-artifact@v2
@@ -66,7 +68,8 @@ jobs:
           matrix.runs-on == 'windows-2019' &&
           github.repository == 'xenia-canary/xenia-canary' &&
           github.event.action != 'pull_request' &&
-          contains(github.ref, 'refs/heads/canary')
+          contains(github.ref, 'refs/heads/canary') &&
+          github.ref != 'refs/heads/canary_base'
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         run: |
@@ -76,5 +79,9 @@ jobs:
             Throw "Error: Archive $asset too small!"
           }
           $tag=$env:GITHUB_SHA.SubString(0,7)
-          $title="${tag}_$($env:GITHUB_REF -replace 'refs/heads/', '')"
+          $branch=$($env:GITHUB_REF -replace 'refs/heads/', '')
+          $title="${tag}_$branch"
           gh release create $tag $asset --target $env:GITHUB_SHA -t $title
+          gh release delete $branch -y
+          If ($LastExitCode -ne 0) { echo "LastExitCode = $LastExitCode";$LastExitCode = 0 }
+          gh release create $branch $asset --target $env:GITHUB_SHA -t $branch