From b5b2eb73c4c9df719a8eaac8fdc4fad3fa910183 Mon Sep 17 00:00:00 2001
From: Margen67 <ihatevistaalot@gmail.com>
Date: Tue, 10 Mar 2020 02:48:40 -0700
Subject: [PATCH] [CI] Even moar changes

Remove CPU info step.

Azure Pipelines:
  Remove unneeded robocopy for SDL2.dll, use direct path for artifact instead.

GitHub Actions:
  Update ISSUE_TEMPLATE exclusion.
  Name stuff.
  Switch back to default shell/robocopy for artifact preparation.
  Seperate xenia-vfs-dump artifact.

GitHub Actions/AppVeyor:
  Add -mx1 to 7z (supposedly faster)
---
 .appveyor.yml            |  7 ++-----
 .azure-pipelines.yml     |  6 +-----
 .github/workflows/CI.yml | 33 ++++++++++++++++++++-------------
 3 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/.appveyor.yml b/.appveyor.yml
index ebbe27cca..af11e05a3 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -29,9 +29,6 @@ pull_requests:
 
 image: Visual Studio 2019
 
-init:
-  - wmic cpu get caption, deviceid, name, numberofcores, maxclockspeed, status
-
 install:
   - xb setup
 
@@ -40,8 +37,8 @@ build_script:
 
 after_build:
   - |-
-      7z a xenia-%appveyor_repo_branch%.zip LICENSE .\build\bin\Windows\Release\xenia-canary.exe
-      7z a xenia-vfs-dump-%appveyor_repo_branch%.zip LICENSE .\build\bin\Windows\Release\xenia-vfs-dump.exe
+      7z a -mx1 xenia-%appveyor_repo_branch%.zip LICENSE .\build\bin\Windows\Release\xenia-canary.exe
+      7z a -mx1 xenia-vfs-dump-%appveyor_repo_branch%.zip LICENSE .\build\bin\Windows\Release\xenia-vfs-dump.exe
 
 test: off
 
diff --git a/.azure-pipelines.yml b/.azure-pipelines.yml
index e98f3e13e..94d3be297 100644
--- a/.azure-pipelines.yml
+++ b/.azure-pipelines.yml
@@ -46,9 +46,6 @@ jobs:
       AVX512:
         cpu_arch: AVX512
   steps:
-  - script: wmic cpu get caption, deviceid, name, numberofcores, maxclockspeed, status
-    displayName: 'CPU info'
-
   - script: xb setup
     displayName: 'Setup'
 
@@ -58,7 +55,6 @@ jobs:
   - script: |-
       robocopy build\bin\Windows\Release $(Build.ArtifactStagingDirectory)\xenia-canary xenia-canary.exe /r:0 /w:0
       robocopy build\bin\Windows\Release $(Build.ArtifactStagingDirectory)\xenia-vfs-dump xenia-vfs-dump.exe /r:0 /w:0
-      robocopy build\bin\Windows\Release $(Build.ArtifactStagingDirectory) SDL2.dll /r:0 /w:0
       robocopy . $(Build.ArtifactStagingDirectory)\xenia-canary LICENSE /r:0 /w:0
       robocopy . $(Build.ArtifactStagingDirectory)\xenia-canary-vfs-dump LICENSE /r:0 /w:0
       IF %ERRORLEVEL% LEQ 7 (exit /b 0) ELSE (exit /b 1)
@@ -73,7 +69,7 @@ jobs:
     artifact: xenia-vfs-dump
     displayName: 'Publish xenia-vfs-dump artifacts'
 
-  - publish: $(Build.ArtifactStagingDirectory)\SDL2.dll
+  - publish: build\bin\Windows\Release\SDL2.dll
     condition: and(succeeded(), eq(variables['Agent.JobName'], 'AVX'))
     artifact: SDL2
     displayName: 'Publish SDL2 artifact(s)'
diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml
index fef43ec6b..f1ffd559b 100644
--- a/.github/workflows/CI.yml
+++ b/.github/workflows/CI.yml
@@ -8,7 +8,7 @@ on:
     paths-ignore:
       - '.github/CONTRIBUTING.md'
       - '.github/FUNDING.md'
-      - '.github/ISSUE_TEMPLATE.md'
+      - '.github/ISSUE_TEMPLATE/*'
       - 'docs/*'
       - 'docs/*/*'
       - '.appveyor.yml'
@@ -23,7 +23,7 @@ on:
     paths-ignore:
       - '.github/CONTRIBUTING.md'
       - '.github/FUNDING.md'
-      - '.github/ISSUE_TEMPLATE.md'
+      - '.github/ISSUE_TEMPLATE/*'
       - 'docs/*'
       - 'docs/*/*'
       - '.appveyor.yml'
@@ -39,10 +39,6 @@ jobs:
       matrix:
         cpu_arch: [AVX, AVX2, AVX512]
     steps:
-    - name: CPU info
-      run: wmic cpu get caption, deviceid, name, numberofcores, maxclockspeed, status
-      shell: cmd
-
     - uses: actions/checkout@v2
       with:
         fetch-depth: 0
@@ -55,17 +51,28 @@ jobs:
 
     - name: Prepare artifacts
       run: |
-        mkdir artifacts
-        cp build/bin/Windows/Release/xenia*.exe LICENSE artifacts
-        7z a xenia-canary.zip LICENSE ./artifacts/xenia-canary.exe
-      shell: bash
+        robocopy build\bin\Windows\Release artifacts\xenia-canary xenia-canary.exe /r:0 /w:0
+        robocopy build\bin\Windows\Release artifacts\xenia-vfs-dump xenia-vfs-dump.exe /r:0 /w:0
+        robocopy . artifacts\xenia-canary LICENSE /r:0 /w:0
+        robocopy . artifacts\xenia-canary-vfs-dump LICENSE /r:0 /w:0
+        If ($LastExitCode -lt 8) { $LastExitCode = 0 }
+        7z a -mx1 xenia-canary.zip LICENSE .\artifacts\xenia-canary\*.exe
 
-    - uses: actions/upload-artifact@v1
+    - name: Upload xenia-canary artifacts
+      uses: actions/upload-artifact@v1
       with:
         name: xenia-canary-${{ matrix.cpu_arch }}
-        path: artifacts
+        path: artifacts\xenia-canary
 
-    - uses: actions/upload-artifact@v1
+    - name: Upload xenia-vfs-dump artifacts
+      uses: actions/upload-artifact@v1
+      if: matrix.cpu_arch == 'AVX'
+      with:
+        name: xenia-vfs-dump
+        path: artifacts\xenia-vfs-dump
+
+    - name: Upload SDL2 artifact(s)
+      uses: actions/upload-artifact@v1
       if: matrix.cpu_arch == 'AVX'
       with:
         name: SDL2