Skip to content

Commit b446540

Browse files
committed
Fix windows CI
1 parent 2a8e94a commit b446540

File tree

1 file changed

+15
-13
lines changed

1 file changed

+15
-13
lines changed

.github/workflows/test.yaml

Lines changed: 15 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -20,26 +20,23 @@ jobs:
2020
steps:
2121
- uses: actions/checkout@v2
2222

23-
- name: create ~/.local/bin
24-
run: mkdir -p "$HOME/.local/bin"
25-
shell: bash
26-
27-
- name: Add ~/.local/bin to PATH
28-
run: echo "$HOME/.local/bin" >> $GITHUB_PATH
29-
shell: bash
30-
3123
- if: matrix.os == 'windows-latest'
3224
name: Install ghcup on windows
3325
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"
3426

27+
- if: matrix.os == 'windows-latest'
28+
name: Install make on windows
29+
run: C:\msys64\usr\bin\bash -lc "pacman -S --noconfirm make"
30+
3531
- if: matrix.os == 'windows-latest'
3632
name: Add ghcup to PATH
37-
run: echo "/c/ghcup/bin" >> $GITHUB_PATH
38-
shell: bash
33+
run: echo "C:\ghcup\bin" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
3934

4035
- if: matrix.os != 'windows-latest'
4136
name: Install ghcup on non-windows
42-
run: curl --proto '=https' --tlsv1.2 -sSf https://get-ghcup.haskell.org | BOOTSTRAP_HASKELL_NONINTERACTIVE=1 BOOTSTRAP_HASKELL_MINIMAL=1 sh
37+
run: |
38+
curl --proto '=https' --tlsv1.2 -sSf https://get-ghcup.haskell.org | BOOTSTRAP_HASKELL_NONINTERACTIVE=1 BOOTSTRAP_HASKELL_MINIMAL=1 sh
39+
echo "$HOME/.cabal/bin" >> $GITHUB_PATH
4340
4441
- name: Install ghc/cabal
4542
run: |
@@ -51,8 +48,13 @@ jobs:
5148
run: cabal update
5249
shell: bash
5350

54-
- name: Install cpphs
55-
run: cabal install --installdir="$HOME/.local/bin" --overwrite-policy=always --install-method=copy cpphs
51+
- if: matrix.os == 'windows-latest'
52+
name: Install cpphs
53+
run: cabal install --installdir="C:\ghcup\bin" --overwrite-policy=always --install-method=copy cpphs
54+
55+
- if: matrix.os != 'windows-latest'
56+
name: Install cpphs
57+
run: cabal install --overwrite-policy=always --install-method=copy cpphs
5658
shell: bash
5759

5860
- name: Build

0 commit comments

Comments
 (0)