Merge pull request #8050 from jandubois/windows-yq

Move yq install on Windows to setup-environment action

.github/actions/setup-environment/action.yaml

@@ -26,6 +26,22 @@ runs:
       # Setting the default version also lets WSL finish updating.
       wsl --set-default-version 2
 
+  - name: "Windows: Install yq"
+    if: runner.os == 'Windows'
+    shell: bash
+    run: |
+      set -o xtrace
+      bindir="$HOME/bin"
+      if [[ ! "$PATH" =~ "$bindir" ]]; then
+        bindir=/usr/bin
+      fi
+      if ! command -v yq; then
+        mkdir -p "$bindir"
+        curl --location --output "$bindir/yq.exe" \
+          https://github.com/mikefarah/yq/releases/download/v4.43.1/yq_windows_amd64.exe
+        chmod a+x "$bindir/yq.exe"
+      fi
+
   - name: "Linux: Enable KVM access"
     if: runner.os == 'Linux'
     shell: bash

.github/workflows/smoke-test.yaml

@@ -112,21 +112,6 @@ jobs:
           exec xvfb-run --auto-servernum
           --server-args='-screen 0 1280x960x24'
 
-    - name: "Windows: Install yq"
-      if: runner.os == 'Windows'
-      run: |
-        set -o xtrace
-        bindir="$HOME/bin"
-        if [[ ! "$PATH" =~ "$bindir" ]]; then
-          bindir=/usr/bin
-        fi
-        if ! command -v yq; then
-          mkdir -p "$bindir"
-          curl --location --output "$bindir/yq.exe" \
-            https://github.com/mikefarah/yq/releases/download/v4.43.1/yq_windows_amd64.exe
-          chmod a+x "$bindir/yq.exe"
-        fi
-      shell: bash
 
     - name: Set log directory
       shell: bash