Fix windows CI

.github/workflows/test.yaml

@@ -20,26 +20,23 @@ jobs:
     steps:
     - uses: actions/checkout@v2
 
-    - name: create ~/.local/bin
-      run: mkdir -p "$HOME/.local/bin"
-      shell: bash
-
-    - name: Add ~/.local/bin to PATH
-      run: echo "$HOME/.local/bin" >> $GITHUB_PATH
-      shell: bash
-
     - if: matrix.os == 'windows-latest'
       name: Install ghcup on windows
       run: Set-ExecutionPolicy Bypass -Scope Process -Force;[System.Net.ServicePointManager]::SecurityProtocol = [System.Net.ServicePointManager]::SecurityProtocol -bor 3072;Invoke-Command -ScriptBlock ([ScriptBlock]::Create((Invoke-WebRequest https://www.haskell.org/ghcup/sh/bootstrap-haskell.ps1 -UseBasicParsing))) -ArgumentList $false,$true,$true,$false,$false,$false,$false,"C:\","", "C:\msys64"
 
+    - if: matrix.os == 'windows-latest'
+      name: Install make on windows
+      run: C:\msys64\usr\bin\bash -lc "pacman -S --noconfirm make"
+
     - if: matrix.os == 'windows-latest'
       name: Add ghcup to PATH
-      run: echo "/c/ghcup/bin" >> $GITHUB_PATH
-      shell: bash
+      run: echo "C:\ghcup\bin" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
 
     - if: matrix.os != 'windows-latest'
       name: Install ghcup on non-windows
-      run: curl --proto '=https' --tlsv1.2 -sSf https://get-ghcup.haskell.org | BOOTSTRAP_HASKELL_NONINTERACTIVE=1 BOOTSTRAP_HASKELL_MINIMAL=1 sh
+      run: |
+        curl --proto '=https' --tlsv1.2 -sSf https://get-ghcup.haskell.org | BOOTSTRAP_HASKELL_NONINTERACTIVE=1 BOOTSTRAP_HASKELL_MINIMAL=1 sh
+        echo "$HOME/.cabal/bin" >> $GITHUB_PATH
 
     - name: Install ghc/cabal
       run: |
@@ -51,8 +48,13 @@ jobs:
       run: cabal update
       shell: bash
 
-    - name: Install cpphs
-      run: cabal install --installdir="$HOME/.local/bin" --overwrite-policy=always --install-method=copy cpphs
+    - if: matrix.os == 'windows-latest'
+      name: Install cpphs
+      run: cabal install --installdir="C:\ghcup\bin" --overwrite-policy=always --install-method=copy cpphs
+
+    - if: matrix.os != 'windows-latest'
+      name: Install cpphs
+      run: cabal install --overwrite-policy=always --install-method=copy cpphs
       shell: bash
 
     - name: Build