Skip to content

Commit 1a394d7

Browse files
authored
Merge pull request #185 from LKedward/fix-stack-ci
Update: CI workflow
2 parents 313fe32 + 0371b8e commit 1a394d7

File tree

1 file changed

+5
-20
lines changed

1 file changed

+5
-20
lines changed

.github/workflows/CI.yml

Lines changed: 5 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -49,26 +49,6 @@ jobs:
4949
which gfortran-${GCC_V}
5050
which gfortran
5151
52-
- name: Install Haskell macOS
53-
if: contains(matrix.os, 'macos')
54-
run: |
55-
mkdir /Users/runner/.local/bin
56-
curl -L https://gist.github.com/certik/0e35f35753ae76f0f575d9b3d3f53633/raw/4cde02cc9215635c9401c2257a46be319e7ab6dd/osx-x86_64.tar.gz | tar xz --strip-components=1 --include '*/stack' -C /Users/runner/.local/bin
57-
58-
- name: Install Haskell Linux
59-
if: contains(matrix.os, 'ubuntu')
60-
uses: mstksg/setup-stack@v1
61-
62-
- name: Install Haskell Windows
63-
if: contains(matrix.os, 'windows')
64-
run: |
65-
(New-Object System.Net.WebClient).DownloadFile("https://get.haskellstack.org/stable/windows-x86_64.zip", "windows-x86_64.zip")
66-
mkdir stack-tmp
67-
cd stack-tmp
68-
unzip ..\windows-x86_64.zip
69-
copy stack.exe "C:\Program Files\Git\usr\bin"
70-
cd ..
71-
7252
- name: Install GFortran Linux
7353
if: contains(matrix.os, 'ubuntu')
7454
run: |
@@ -105,6 +85,11 @@ jobs:
10585
run: |
10686
copy "C:\Users\runneradmin\AppData\Roaming\local\bin\fpm.exe" "C:\Program Files\Git\usr\bin"
10787
88+
- name: put fpm to PATH (Linux)
89+
if: contains(matrix.os, 'ubuntu')
90+
run: |
91+
sudo cp /home/runner/.local/bin/fpm /usr/local/bin
92+
10893
- name: Run tests on Haskell fpm
10994
run: |
11095
cd bootstrap

0 commit comments

Comments
 (0)