wip

Author: BillyONeal

.github/workflows/test_modified_ports.yml

@@ -26,47 +26,52 @@ jobs:
           - 'arm64-android'
         include:
           - triplet: 'x86-windows'
-            pool: windows
+            use-windows: true
             extra-checks: true
           - triplet: 'x64-windows'
-            pool: windows
+            use-windows: true
           - triplet: 'x64-windows-static'
-            pool: windows
+            use-windows: true
           - triplet: 'x64-windows-static-md'
-            pool: windows
+            use-windows: true
           - triplet: 'x64-uwp'
-            pool: windows
+            use-windows: true
           - triplet: 'arm64-windows'
-            pool: windows
+            use-windows: true
           - triplet: 'arm64-uwp'
-            pool: windows
+            use-windows: true
           - triplet: 'arm64-osx'
-            pool: macOS
+            use-macos: true
           - triplet: 'x64-osx'
-            pool: macOS
+            use-macos: true
           - triplet: 'x64-linux'
-            pool: linux
+            use-linux: true
           - triplet: 'arm-neon-android'
-            pool: android
+            use-android: true
           - triplet: 'x64-android'
-            pool: android
+            use-android: true
           - triplet: 'arm64-android'
-            pool: android
-          - pool: windows
+            use-android: true
+          ###############################################
+          - use-windows: true
+            pool: windows
             onees: vcpkg-windows-wus
             artifact-staging: "D:\\artifactstaging"
             vcpkg-downloads: "D:\\downloads"
             working-root: "D:\\"
-          - pool: macOS
+          - use-macos: true
+            pool: macOS
             onees: vcpkg-windows-wus   # FIXME: This should be the macOS pool
             artifact-staging: /mnt/vcpkg-ci/artifactstaging  # FIXME: Are these paths reasonable?
             vcpkg-downloads: /mnt/vcpkg-ci/downloads
             working-root: /mnt/vcpkg-ci
-          - pool: linux
+          - use-linux: true
+            pool: linux
             onees: vcpkg-windows-wus   # FIXME: This should be the linux pool
             artifact-staging: /mnt/vcpkg-ci/artifactstaging
             working-root: /mnt/vcpkg-ci
-          - pool: android
+          - use-android: true
+            pool: android
             onees: vcpkg-windows-wus   # FIXME: This should be the android pool
             artifact-staging: /mnt/vcpkg-ci/artifactstaging
             working-root: /mnt/vcpkg-ci
@@ -82,19 +87,19 @@ jobs:
       - name: testing testing testing
         run: echo "The value of matrix.pool is ${{ matrix.pool }}"
       - name: Block non-Windows (for testing)
-        if: ${{ matrix.pool != 'windows' }}
+        if: ${{ success() && !matrix.use-windows }}
         run: exit 1
       - name: Checkout (Windows)
         uses: actions/checkout@v4
-        if: ${{ matrix.pool == 'windows' }}
+        if: ${{ success() && matrix.use-windows }}
         env:
           PATH: c:\Program Files\Microsoft Visual Studio\2022\Enterprise\Common7\IDE\CommonExtensions\Microsoft\TeamFoundation\Team Explorer\Git\cmd;$PATH
         with:
           # fetch-depth 50 tries to ensure we capture the whole history of the branch
           fetch-depth: 50
       - name: Checkout (Non-Windows)
         uses: actions/checkout@v4
-        if: ${{ matrix.pool != 'windows' }}
+        if: ${{ success() && !matrix.use-windows }}
         with:
           # fetch-depth 50 tries to ensure we capture the whole history of the branch
           fetch-depth: 50
@@ -105,20 +110,20 @@ jobs:
           subscription-id: 7fcb00fa-a761-49de-8a2f-d67190e62882
           tenant-id: 72f988bf-86f1-41af-91ab-2d7cd011db47
       - name: Bootstrap (Windows)
-        if: ${{ matrix.pool == 'windows' }}
+        if: ${{ success() && matrix.use-windows }}
         run: ./scripts/bootstrap.ps1
       - name: Bootstrap (Non-Windows)
-        if: ${{ matrix.pool != 'windows' }}
+        if: ${{ success() && !matrix.use-windows }}
         run: ./scripts/bootstrap.sh
       - name: Format Manifests
-        if: ${{ matrix.extra-checks }}
+        if: ${{ success() && matrix.extra-checks }}
         run: ./vcpkg.exe format-manifest --all
       - name: Create Format Manifest Diff
-        if: ${{ matrix.extra-checks }}
+        if: ${{ success() && matrix.extra-checks }}
         run: ./scripts/azure-pipelines/Create-PRDiff.ps1 -DiffFile "${{ matrix.artifact-staging }}/format.diff"
       - name: 'Publish Artifact: Format Diff'
         uses: actions/upload-artifact@v4
-        if: ${{ matrix.extra-checks && failure() }}
+        if: ${{ failure() && !cancelled() && matrix.extra-checks }}
         with:
           name: 'format.diff'
           path: "${{ matrix.artifact-staging }}/format.diff"
@@ -162,13 +167,13 @@ jobs:
           retention-days: 7
           if-no-files-found: ignore
       - name: 'Build a file list for all packages'
-        if: ${{ always() }}
+        if: ${{ !cancelled() }}
         shell: pwsh
         run: |
             & $(./vcpkg fetch python3) ./scripts/file_script.py "${{ matrix.working-root }}/installed/vcpkg/info/"
       - name: 'Publish Artifact: file lists for ${{ matrix.triplet }}'
         uses: actions/upload-artifact@v4
-        if: ${{ always() }}
+        if: ${{ !cancelled() }}
         with:
           name: 'file lists for ${{ matrix.triplet }}'
           path: scripts/list_files