COMP: Pass matrix.os to Plus builds

Author: Sunderlandkyl

.github/workflows/build-plus.yml

@@ -7,6 +7,9 @@ on:
         required: true
         type: string
         default: x64
+      os:
+        required: true
+        type: string
       # Dependency versions
       qt-version:
         required: false
@@ -64,7 +67,7 @@ on:
 
 jobs:
   build:
-    runs-on: windows-latest
+    runs-on: ${{ inputs.os }}
 
     steps:
     - name: Restore VTK Cache

.github/workflows/ci.yml

@@ -103,6 +103,8 @@ jobs:
       arch: ${{ matrix.arch }}
       build-type: ${{ matrix.build_type }}
 
+  ########
+  # BUILD PLUS
   build_plus_x64:
     needs: [update_vtk_x64, update_itk_x64]
     uses: ./.github/workflows/build-plus.yml
@@ -116,6 +118,7 @@ jobs:
       pltools-access-token: ${{ secrets.PLTOOLS_ACCESS_TOKEN }}
     with:
       arch: ${{ matrix.arch }}
+      os: ${{ matrix.os }}
       pluslib-repository: https://github.com/${{ github.event_name == 'pull_request' && github.event.pull_request.head.repo.full_name || github.repository }}.git
       pluslib-tag: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.sha || github.sha }}
       vtk-cache-key: ${{ needs.update_vtk_x64.outputs.cache-key }}
@@ -153,7 +156,8 @@ jobs:
     secrets:
       pltools-access-token: ${{ secrets.PLTOOLS_ACCESS_TOKEN }}
     with:
-      arch: Win32
+      arch: ${{ matrix.arch }}
+      os: ${{ matrix.os }}
       pluslib-repository: https://github.com/${{ github.event_name == 'pull_request' && github.event.pull_request.head.repo.full_name || github.repository }}.git
       pluslib-tag: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.sha || github.sha }}
       vtk-cache-key: ${{ needs.update_vtk_Win32.outputs.cache-key }}
@@ -196,6 +200,7 @@ jobs:
       pltools-access-token: ${{ secrets.PLTOOLS_ACCESS_TOKEN }}
     with:
       arch: ${{ matrix.arch }}
+      os: ${{ matrix.os }}
       pluslib-repository: https://github.com/${{ github.event_name == 'pull_request' && github.event.pull_request.head.repo.full_name || github.repository }}.git
       pluslib-tag: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.sha || github.sha }}
       vtk-cache-key: ${{ needs.update_vtk_static_x64.outputs.cache-key }}

.github/workflows/nightly.yml

@@ -79,6 +79,7 @@ jobs:
       pltools-access-token: ${{ secrets.PLTOOLS_ACCESS_TOKEN }}
     with:
       arch: ${{ matrix.arch }}
+      os: ${{ matrix.os }}
       pluslib-repository: https://github.com/${{ github.repository }}.git
       pluslib-tag: ${{ github.sha }}
       use-pltools: true
@@ -132,6 +133,7 @@ jobs:
       pltools-access-token: ${{ secrets.PLTOOLS_ACCESS_TOKEN }}
     with:
       arch: ${{ matrix.arch }}
+      os: ${{ matrix.os }}
       pluslib-repository: https://github.com/${{ github.repository }}.git
       pluslib-tag: ${{ github.sha }}
       use-pltools: true
@@ -157,6 +159,7 @@ jobs:
       pltools-access-token: ${{ secrets.PLTOOLS_ACCESS_TOKEN }}
     with:
       arch: ${{ matrix.arch }}
+      os: ${{ matrix.os }}
       pluslib-repository: https://github.com/${{ github.repository }}.git
       pluslib-tag: ${{ github.sha }}
       use-pltools: true
@@ -182,6 +185,7 @@ jobs:
       pltools-access-token: ${{ secrets.PLTOOLS_ACCESS_TOKEN }}
     with:
       arch: ${{ matrix.arch }}
+      os: ${{ matrix.os }}
       pluslib-repository: https://github.com/${{ github.repository }}.git
       pluslib-tag: ${{ github.sha }}
       use-pltools: true
@@ -207,6 +211,7 @@ jobs:
       pltools-access-token: ${{ secrets.PLTOOLS_ACCESS_TOKEN }}
     with:
       arch: ${{ matrix.arch }}
+      os: ${{ matrix.os }}
       pluslib-repository: https://github.com/${{ github.repository }}.git
       pluslib-tag: ${{ github.sha }}
       use-pltools: true
@@ -234,6 +239,7 @@ jobs:
       pltools-access-token: ${{ secrets.PLTOOLS_ACCESS_TOKEN }}
     with:
       arch: ${{ matrix.arch }}
+      os: ${{ matrix.os }}
       pluslib-repository: https://github.com/${{ github.repository }}.git
       pluslib-tag: ${{ github.sha }}
       use-pltools: true
@@ -260,6 +266,7 @@ jobs:
       pltools-access-token: ${{ secrets.PLTOOLS_ACCESS_TOKEN }}
     with:
       arch: ${{ matrix.arch }}
+      os: ${{ matrix.os }}
       pluslib-repository: https://github.com/${{ github.repository }}.git
       pluslib-tag: ${{ github.sha }}
       use-pltools: true
@@ -285,6 +292,7 @@ jobs:
       pltools-access-token: ${{ secrets.PLTOOLS_ACCESS_TOKEN }}
     with:
       arch: ${{ matrix.arch }}
+      os: ${{ matrix.os }}
       pluslib-repository: https://github.com/${{ github.repository }}.git
       pluslib-tag: ${{ github.sha }}
       use-pltools: true
@@ -336,6 +344,7 @@ jobs:
       pltools-access-token: ${{ secrets.PLTOOLS_ACCESS_TOKEN }}
     with:
       arch: ${{ matrix.arch }}
+      os: ${{ matrix.os }}
       pluslib-repository: https://github.com/${{ github.repository }}.git
       pluslib-tag: ${{ github.sha }}
       use-pltools: true
@@ -361,6 +370,7 @@ jobs:
       pltools-access-token: ${{ secrets.PLTOOLS_ACCESS_TOKEN }}
     with:
       arch: ${{ matrix.arch }}
+      os: ${{ matrix.os }}
       pluslib-repository: https://github.com/${{ github.repository }}.git
       pluslib-tag: ${{ github.sha }}
       use-pltools: true
@@ -386,6 +396,7 @@ jobs:
       pltools-access-token: ${{ secrets.PLTOOLS_ACCESS_TOKEN }}
     with:
       arch: ${{ matrix.arch }}
+      os: ${{ matrix.os }}
       pluslib-repository: https://github.com/${{ github.repository }}.git
       pluslib-tag: ${{ github.sha }}
       use-pltools: true