Fix Install WDK (NuGet) script's condition in accordance to the power…

…shell shell
microsoft · Oct 16, 2024 · f4087df · f4087df
1 parent 37b4bd6
commit f4087df
Show file tree

Hide file tree

Showing 5 changed files with 25 additions and 26 deletions.
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
@@ -74,14 +74,13 @@ jobs:
       - name: Install ${{ matrix.wdk }} (NuGet)
         if: startsWith(matrix.wdk, '10.0.')
         run: |
-          wdk="${{ matrix.wdk }}"
-          if [[ "$wdk" =~ ^10\.0\.[0-9]{5}\.[0-9]{1,4}$ ]]; then
+          $wdk = '${{ matrix.wdk }}'
+          if ($wdk -match '^10\.0\.\d{5}\.\d{1,4}$') {
             ./.github/scripts/nuget-install-wdk.ps1 -wdkVersion $wdk
-          else
-            echo "WDK version $wdk does not match the required format 10.0.{5 digit number}.{1 to 4 digit number}"
+          } else {
+            Write-Host "WDK version $wdk does not match the required format 10.0.{5 digit number}.{1 to 4 digit number}"
             exit 1
-          fi
-        shell: bash                 
+          }
 
       - name: Install Rust Toolchain (${{ matrix.rust_toolchain }})
         uses: dtolnay/rust-toolchain@master

diff --git a/.github/workflows/docs.yaml b/.github/workflows/docs.yaml
@@ -69,13 +69,13 @@ jobs:
       - name: Install ${{ matrix.wdk }} (NuGet)
         if: startsWith(matrix.wdk, '10.0.')
         run: |
-          wdk="${{ matrix.wdk }}"
-          if [[ "$wdk" =~ ^10\.0\.[0-9]{5}\.[0-9]{1,4}$ ]]; then
+          $wdk = '${{ matrix.wdk }}'
+          if ($wdk -match '^10\.0\.\d{5}\.\d{1,4}$') {
             ./.github/scripts/nuget-install-wdk.ps1 -wdkVersion $wdk
-          else
-            echo "WDK version $wdk does not match the required format 10.0.{5 digit number}.{1 to 4 digit number}"
+          } else {
+            Write-Host "WDK version $wdk does not match the required format 10.0.{5 digit number}.{1 to 4 digit number}"
             exit 1
-          fi
+          }
 
       - name: Install Rust Toolchain (${{ matrix.rust_toolchain }})
         uses: dtolnay/rust-toolchain@master

diff --git a/.github/workflows/lint.yaml b/.github/workflows/lint.yaml
@@ -68,13 +68,13 @@ jobs:
       - name: Install ${{ matrix.wdk }} (NuGet)
         if: startsWith(matrix.wdk, '10.0.')
         run: |
-          wdk="${{ matrix.wdk }}"
-          if [[ "$wdk" =~ ^10\.0\.[0-9]{5}\.[0-9]{1,4}$ ]]; then
+          $wdk = '${{ matrix.wdk }}'
+          if ($wdk -match '^10\.0\.\d{5}\.\d{1,4}$') {
             ./.github/scripts/nuget-install-wdk.ps1 -wdkVersion $wdk
-          else
-            echo "WDK version $wdk does not match the required format 10.0.{5 digit number}.{1 to 4 digit number}"
+          } else {
+            Write-Host "WDK version $wdk does not match the required format 10.0.{5 digit number}.{1 to 4 digit number}"
             exit 1
-          fi
+          }
 
       - name: Install Rust Toolchain (${{ matrix.rust_toolchain }})
         uses: dtolnay/rust-toolchain@master

diff --git a/.github/workflows/local-development-makefile.yaml b/.github/workflows/local-development-makefile.yaml
@@ -60,13 +60,13 @@ jobs:
       - name: Install ${{ matrix.wdk }} (NuGet)
         if: startsWith(matrix.wdk, '10.0.')
         run: |
-          wdk="${{ matrix.wdk }}"
-          if [[ "$wdk" =~ ^10\.0\.[0-9]{5}\.[0-9]{1,4}$ ]]; then
+          $wdk = '${{ matrix.wdk }}'
+          if ($wdk -match '^10\.0\.\d{5}\.\d{1,4}$') {
             ./.github/scripts/nuget-install-wdk.ps1 -wdkVersion $wdk
-          else
-            echo "WDK version $wdk does not match the required format 10.0.{5 digit number}.{1 to 4 digit number}"
+          } else {
+            Write-Host "WDK version $wdk does not match the required format 10.0.{5 digit number}.{1 to 4 digit number}"
             exit 1
-          fi
+          }
       - name: Install Nightly Rust Toolchain (${{ matrix.target_triple }})
         uses: dtolnay/rust-toolchain@nightly
         with:

diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
@@ -66,13 +66,13 @@ jobs:
       - name: Install ${{ matrix.wdk }} (NuGet)
         if: startsWith(matrix.wdk, '10.0.')
         run: |
-          wdk="${{ matrix.wdk }}"
-          if [[ "$wdk" =~ ^10\.0\.[0-9]{5}\.[0-9]{1,4}$ ]]; then
+          $wdk = '${{ matrix.wdk }}'
+          if ($wdk -match '^10\.0\.\d{5}\.\d{1,4}$') {
             ./.github/scripts/nuget-install-wdk.ps1 -wdkVersion $wdk
-          else
-            echo "WDK version $wdk does not match the required format 10.0.{5 digit number}.{1 to 4 digit number}"
+          } else {
+            Write-Host "WDK version $wdk does not match the required format 10.0.{5 digit number}.{1 to 4 digit number}"
             exit 1
-          fi
+          }
 
       - name: Install Rust Toolchain (${{ matrix.rust_toolchain }})
         uses: dtolnay/rust-toolchain@master