From 05b4ccc0443240acceed6f583e90edce3c5b8591 Mon Sep 17 00:00:00 2001
From: AnyOldName3 <krizdjali@gmail.com>
Date: Thu, 30 May 2024 21:33:57 +0100
Subject: [PATCH 1/2] Suppress vcpkg export errors

If we export then separate PDBs, vcpkg won't yell at us that the already-separated PDBs are gone.
---
 .github/workflows/build.yaml | 44 +++++++++++++++++++++---------------
 1 file changed, 26 insertions(+), 18 deletions(-)

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index cddfcba..5578972 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -66,8 +66,16 @@ jobs:
         openmw-osg
         sdl2
 
+    - name: Export installed vcpkg packages
+      run: >
+        vcpkg export
+        --x-all-installed
+        --raw
+        --output-dir ${{ github.workspace }}
+        --output intermediate
+
     - name: Move pdb files
-      working-directory: 'C:/vcpkg'
+      working-directory: '${{ github.workspace }}/intermediate'
       run: |
         robocopy installed pdb/installed *.pdb /S /MOVE
         if ($lastexitcode -lt 8) {
@@ -75,7 +83,7 @@ jobs:
         }
 
     - name: Archive pdb files
-      working-directory: 'C:/vcpkg/pdb'
+      working-directory: '${{ github.workspace }}/intermediate/pdb'
       run: 7z a "${{ github.workspace }}/vcpkg-x64-${{ matrix.image }}-static-pdb-${{ github.sha }}.7z" installed
 
     - name: Store archived pdb files
@@ -84,13 +92,9 @@ jobs:
         name: vcpkg-x64-${{ matrix.image }}-static-pdb-${{ github.sha }}
         path: ${{ github.workspace }}/vcpkg-x64-${{ matrix.image }}-static-pdb-${{ github.sha }}.7z
 
-    - name: Export installed vcpkg packages
-      run: >
-        vcpkg export
-        --x-all-installed
-        --7zip
-        --output-dir ${{ github.workspace }}
-        --output vcpkg-x64-${{ matrix.image }}-static-${{ github.sha }}
+    - name: Archive everything else
+      working-directory: '${{ github.workspace }}/intermediate'
+      run: 7z a "${{ github.workspace }}/vcpkg-x64-${{ matrix.image }}-static-${{ github.sha }}.7z" *
 
     - name: Store exported vcpkg packages
       uses: actions/upload-artifact@v4
@@ -150,8 +154,16 @@ jobs:
         openmw-osg
         sdl2
 
+    - name: Export installed vcpkg packages
+      run: >
+        vcpkg export
+        --x-all-installed
+        --raw
+        --output-dir ${{ github.workspace }}
+        --output intermediate
+
     - name: Move pdb files
-      working-directory: 'C:/vcpkg'
+      working-directory: '${{ github.workspace }}/intermediate'
       run: |
         robocopy installed pdb/installed *.pdb /S /MOVE
         if ($lastexitcode -lt 8) {
@@ -159,7 +171,7 @@ jobs:
         }
 
     - name: Archive pdb files
-      working-directory: 'C:/vcpkg/pdb'
+      working-directory: '${{ github.workspace }}/intermediate/pdb'
       run: 7z a "${{ github.workspace }}/vcpkg-x64-${{ matrix.image }}-pdb-${{ github.sha }}.7z" installed
 
     - name: Store archived pdb files
@@ -168,13 +180,9 @@ jobs:
         name: vcpkg-x64-${{ matrix.image }}-pdb-${{ github.sha }}
         path: ${{ github.workspace }}/vcpkg-x64-${{ matrix.image }}-pdb-${{ github.sha }}.7z
 
-    - name: Export installed vcpkg packages
-      run: >
-        vcpkg export
-        --x-all-installed
-        --7zip
-        --output-dir ${{ github.workspace }}
-        --output vcpkg-x64-${{ matrix.image }}-${{ github.sha }}
+    - name: Archive everything else
+      working-directory: '${{ github.workspace }}/intermediate'
+      run: 7z a "${{ github.workspace }}/vcpkg-x64-${{ matrix.image }}-${{ github.sha }}.7z" *
 
     - name: Store exported vcpkg packages
       uses: actions/upload-artifact@v4

From 376bf169d8e5defae7857f735d58e3e7fce6594b Mon Sep 17 00:00:00 2001
From: AnyOldName3 <krizdjali@gmail.com>
Date: Thu, 30 May 2024 21:49:21 +0100
Subject: [PATCH 2/2] Actually exclude the pdb directory

---
 .github/workflows/build.yaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 5578972..d2b0110 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -94,7 +94,7 @@ jobs:
 
     - name: Archive everything else
       working-directory: '${{ github.workspace }}/intermediate'
-      run: 7z a "${{ github.workspace }}/vcpkg-x64-${{ matrix.image }}-static-${{ github.sha }}.7z" *
+      run: 7z a "${{ github.workspace }}/vcpkg-x64-${{ matrix.image }}-static-${{ github.sha }}.7z" * -x!pdb
 
     - name: Store exported vcpkg packages
       uses: actions/upload-artifact@v4
@@ -182,7 +182,7 @@ jobs:
 
     - name: Archive everything else
       working-directory: '${{ github.workspace }}/intermediate'
-      run: 7z a "${{ github.workspace }}/vcpkg-x64-${{ matrix.image }}-${{ github.sha }}.7z" *
+      run: 7z a "${{ github.workspace }}/vcpkg-x64-${{ matrix.image }}-${{ github.sha }}.7z" * -x!pdb
 
     - name: Store exported vcpkg packages
       uses: actions/upload-artifact@v4