Fix failing tests on windows-2022 due to WSL tool changes

Vampire · Jan 23, 2023 · b4ffb29 · b4ffb29
1 parent 13a8890
commit b4ffb29
Show file tree

Hide file tree

Showing 2 changed files with 36 additions and 13 deletions.
diff --git a/.github/workflows/template/test.yml b/.github/workflows/template/test.yml
@@ -193,10 +193,18 @@ jobs:
                   && (steps.execute_action.outcome == 'success')
               shell: wsl-bash {0}
               run: >
-                  wslconfig.exe /list | iconv -f UTF-16LE -t UTF-8
+                  cat
+                  <(wsl.exe --list || true)
+                  <(wsl.exe --list || true | iconv -f UTF-16LE -t UTF-8)
+                  <(wslconfig.exe /list || true)
+                  <(wslconfig.exe /list || true | iconv -f UTF-16LE -t UTF-8)
 
                   [[
-                  "$(wslconfig.exe /list | iconv -f UTF-16LE -t UTF-8)"
+                  "$(cat
+                  <(wsl.exe --list || true)
+                  <(wsl.exe --list || true | iconv -f UTF-16LE -t UTF-8)
+                  <(wslconfig.exe /list || true)
+                  <(wslconfig.exe /list || true | iconv -f UTF-16LE -t UTF-8))"
                   ==
                   *${{ matrix.distribution.wsl-id }}\ \(Default\)*
                   ]]
@@ -923,12 +931,18 @@ jobs:
                   && (steps.execute_action4.outcome == 'success')
               shell: wsl-bash {0}
               run: >
-                  wslconfig.exe /list
-
-                  wslconfig.exe /list | iconv -f UTF-16LE -t UTF-8
+                  cat
+                  <(wsl.exe --list || true)
+                  <(wsl.exe --list || true | iconv -f UTF-16LE -t UTF-8)
+                  <(wslconfig.exe /list || true)
+                  <(wslconfig.exe /list || true | iconv -f UTF-16LE -t UTF-8)
 
                   [[
-                  "$(wslconfig.exe /list | iconv -f UTF-16LE -t UTF-8)"
+                  "$(cat
+                  <(wsl.exe --list || true)
+                  <(wsl.exe --list || true | iconv -f UTF-16LE -t UTF-8)
+                  <(wslconfig.exe /list || true)
+                  <(wslconfig.exe /list || true | iconv -f UTF-16LE -t UTF-8))"
                   ==
                   *${{ matrix.distributions.distribution2.wsl-id }}\ \(Default\)*
                   ]]

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -135,8 +135,11 @@ jobs:
       shell: "wsl-bash {0}"
     - if: "always() && (steps.execute_action.outcome == 'success')"
       name: "Test - the default distribution should be correct"
-      run: "wslconfig.exe /list | iconv -f UTF-16LE -t UTF-8\n[[ \"$(wslconfig.exe\
-        \ /list | iconv -f UTF-16LE -t UTF-8)\" == *${{ matrix.distribution.wsl-id\
+      run: "cat <(wsl.exe --list || true) <(wsl.exe --list || true | iconv -f UTF-16LE\
+        \ -t UTF-8) <(wslconfig.exe /list || true) <(wslconfig.exe /list || true |\
+        \ iconv -f UTF-16LE -t UTF-8)\n[[ \"$(cat <(wsl.exe --list || true) <(wsl.exe\
+        \ --list || true | iconv -f UTF-16LE -t UTF-8) <(wslconfig.exe /list || true)\
+        \ <(wslconfig.exe /list || true | iconv -f UTF-16LE -t UTF-8))\" == *${{ matrix.distribution.wsl-id\
         \ }}\\ \\(Default\\)* ]]\n"
       shell: "wsl-bash {0}"
     - if: "always() && (steps.execute_action.outcome == 'success')"
@@ -311,8 +314,11 @@ jobs:
       shell: "wsl-bash {0}"
     - if: "always() && (steps.execute_action1.outcome == 'success')"
       name: "Test - the default distribution should be correct"
-      run: "wslconfig.exe /list | iconv -f UTF-16LE -t UTF-8\n[[ \"$(wslconfig.exe\
-        \ /list | iconv -f UTF-16LE -t UTF-8)\" == *${{ matrix.distribution.wsl-id\
+      run: "cat <(wsl.exe --list || true) <(wsl.exe --list || true | iconv -f UTF-16LE\
+        \ -t UTF-8) <(wslconfig.exe /list || true) <(wslconfig.exe /list || true |\
+        \ iconv -f UTF-16LE -t UTF-8)\n[[ \"$(cat <(wsl.exe --list || true) <(wsl.exe\
+        \ --list || true | iconv -f UTF-16LE -t UTF-8) <(wslconfig.exe /list || true)\
+        \ <(wslconfig.exe /list || true | iconv -f UTF-16LE -t UTF-8))\" == *${{ matrix.distribution.wsl-id\
         \ }}\\ \\(Default\\)* ]]\n"
       shell: "wsl-bash {0}"
     - if: "always() && (steps.execute_action1.outcome == 'success')"
@@ -827,8 +833,11 @@ jobs:
     - if: "always() && (steps.execute_action4.outcome == 'success')"
       name: "Test - the default distribution should be the last installed distribution\
         \ with set-as-default true"
-      run: "wslconfig.exe /list\nwslconfig.exe /list | iconv -f UTF-16LE -t UTF-8\n\
-        [[ \"$(wslconfig.exe /list | iconv -f UTF-16LE -t UTF-8)\" == *${{ matrix.distributions.distribution2.wsl-id\
+      run: "cat <(wsl.exe --list || true) <(wsl.exe --list || true | iconv -f UTF-16LE\
+        \ -t UTF-8) <(wslconfig.exe /list || true) <(wslconfig.exe /list || true |\
+        \ iconv -f UTF-16LE -t UTF-8)\n[[ \"$(cat <(wsl.exe --list || true) <(wsl.exe\
+        \ --list || true | iconv -f UTF-16LE -t UTF-8) <(wslconfig.exe /list || true)\
+        \ <(wslconfig.exe /list || true | iconv -f UTF-16LE -t UTF-8))\" == *${{ matrix.distributions.distribution2.wsl-id\
         \ }}\\ \\(Default\\)* ]]\n"
       shell: "wsl-bash {0}"
     - if: "always() && (steps.execute_action4.outcome == 'success')"
@@ -1390,4 +1399,4 @@ jobs:
             "user-id": "Ubuntu-16.04"
             "match-pattern": "*Ubuntu*16.04*"
             "default-absent-tool": "dos2unix"
-      fail-fast: false
+      fail-fast: false