From 8a4f1ef51a037d77d2746304d89bef6a325a790b Mon Sep 17 00:00:00 2001
From: Tyler Wilding <xtvaser@gmail.com>
Date: Sat, 6 Nov 2021 22:40:20 -0500
Subject: [PATCH] ci: stop building 32-bit

At this point -- not cleaning up the solution files / etc, only our actions.

Until the 32bit code itself is removed, we should still have an easy way to flip these back on.
---
 .github/workflows/linux-workflow.yml              | 12 +++---------
 .../releases/upload-release-artifacts/index.js    |  3 ---
 .github/workflows/windows-workflow.yml            | 15 ++++++---------
 3 files changed, 9 insertions(+), 21 deletions(-)

diff --git a/.github/workflows/linux-workflow.yml b/.github/workflows/linux-workflow.yml
index 24648ea3bd..87b6aeb7c5 100644
--- a/.github/workflows/linux-workflow.yml
+++ b/.github/workflows/linux-workflow.yml
@@ -44,12 +44,6 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - os: ubuntu-18.04
-            platform: x86
-            compiler: gcc
-            cmakeflags: -DLTO_PCSX2_CORE=ON
-            appimage: true
-            experimental: false
           - os: ubuntu-18.04
             platform: x64
             compiler: gcc
@@ -57,7 +51,7 @@ jobs:
             appimage: true
             experimental: false
           - os: ubuntu-18.04
-            platform: x86
+            platform: x64
             compiler: clang
             # Need to disable PCH until cmake 3.17
             # (PCH conflicts with ccache, fixed by https://gitlab.kitware.com/cmake/cmake/-/merge_requests/4400)
@@ -66,14 +60,14 @@ jobs:
             appimage: false
             experimental: false
           - os: ubuntu-18.04
-            platform: x86
+            platform: x64
             compiler: gcc
             cmakeflags: -DCMAKE_DISABLE_PRECOMPILE_HEADERS=ON
             detail: " nopch"
             appimage: false
             experimental: false
           - os: ubuntu-18.04
-            platform: x86
+            platform: x64
             compiler: gcc
             cmakeflags: -DCMAKE_DISABLE_PRECOMPILE_HEADERS=ON -DARCH_FLAG=-march=haswell
             detail: " avx2 nopch"
diff --git a/.github/workflows/scripts/releases/upload-release-artifacts/index.js b/.github/workflows/scripts/releases/upload-release-artifacts/index.js
index 369b16b579..9af0100eca 100644
--- a/.github/workflows/scripts/releases/upload-release-artifacts/index.js
+++ b/.github/workflows/scripts/releases/upload-release-artifacts/index.js
@@ -111,11 +111,8 @@ const { data: releaseAssetsPost } = await octokit.rest.repos.listReleaseAssets({
 
 // Expected Assets, if we have all of them, we will publish it
 let expectedAssets = {
-  "windows-32bit-sse4": false,
-  "windows-32bit-avx2": false,
   "windows-64bit-sse4": false,
   "windows-64bit-avx2": false,
-  "linux-appimage-32bit": false,
   "linux-appimage-64bit": false
 }
 
diff --git a/.github/workflows/windows-workflow.yml b/.github/workflows/windows-workflow.yml
index 5a4ba2c242..a71bbc5cf5 100644
--- a/.github/workflows/windows-workflow.yml
+++ b/.github/workflows/windows-workflow.yml
@@ -41,12 +41,9 @@ jobs:
       fail-fast: false
       matrix:
         os: [windows-2019]
-        platform: [Win32, x64]
+        platform: [x64]
         configuration: [Release, Release AVX2, CMake, Qt]
         experimental: [false]
-        exclude:
-          - platform: win32
-            configuration: Qt
 
     name: ${{ matrix.platform }} | ${{ matrix.configuration }}
     runs-on: ${{ matrix.os }}
@@ -70,18 +67,18 @@ jobs:
         run: git submodule update --init --recursive -j $env:NUMBER_OF_PROCESSORS
 
       - name: Setup Buildcache
+        if: matrix.configuration == 'CMake' # TODO: buildcache on VS
         uses: mikehardy/buildcache-action@v1.2.2
         with:
           cache_key: ${{ matrix.os }} ${{ matrix.platform }} ${{ matrix.configuration }}
-        if: matrix.configuration == 'CMake' # TODO: buildcache on VS
 
       - name: Verify VS Project Files
-        run: .github\workflows\scripts\windows\validate-vs-filters.ps1
         if: matrix.configuration != 'CMake'
+        run: .github\workflows\scripts\windows\validate-vs-filters.ps1
 
       - name: Setup msbuild
-        uses: microsoft/setup-msbuild@v1
         if: matrix.configuration != 'CMake'
+        uses: microsoft/setup-msbuild@v1
 
       - name: Download Qt build files
         if: matrix.configuration == 'Qt'
@@ -93,6 +90,7 @@ jobs:
           del qt-6.2.2-x64.7z
 
       - name: Generate CMake
+        if: matrix.configuration == 'CMake'
         id: cmake
         shell: cmd
         run: |
@@ -102,7 +100,6 @@ jobs:
           echo ::set-output name=buildtype::%type%
           echo ::set-output name=vcvars::%vcvars%
           cmake . -B build -DCMAKE_BUILD_TYPE=%type% -DLTO_PCSX2_CORE=ON -G Ninja -DCMAKE_C_COMPILER_LAUNCHER=..\buildcache\bin\buildcache.exe -DCMAKE_CXX_COMPILER_LAUNCHER=..\buildcache\bin\buildcache.exe -DCMAKE_DISABLE_PRECOMPILE_HEADERS=ON
-        if: matrix.configuration == 'CMake'
 
       - name: Build PCSX2
         shell: cmd
@@ -123,11 +120,11 @@ jobs:
           )
 
       - name: Run Tests
+        if: matrix.configuration == 'CMake'
         shell: cmd
         run: |
           call "%ProgramFiles(x86)%\Microsoft Visual Studio\2019\Enterprise\VC\Auxiliary\Build\${{ steps.cmake.outputs.vcvars }}"
           cmake --build build --config ${{ steps.cmake.outputs.buildtype }} --target unittests
-        if: matrix.configuration == 'CMake'
 
       - name: Prepare Artifact Metadata
         id: artifact-metadata