Suppress vcpkg export errors

If we export then separate PDBs, vcpkg won't yell at us that the already-separated PDBs are gone.
OpenMW · May 30, 2024 · 05b4ccc · 05b4ccc
1 parent db52b0b
commit 05b4ccc
Showing 1 changed file with 26 additions and 18 deletions.
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
@@ -66,16 +66,24 @@ 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) {
           $global:LASTEXITCODE = $null
         }
 
     - 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,16 +154,24 @@ 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) {
           $global:LASTEXITCODE = $null
         }
 
     - 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