Skip to content

Commit 49bea71

Browse files
authored
Use pre-installed haskell stack
Copy fpm to /usr/local/bin on ubuntu
1 parent 2c5de3c commit 49bea71

File tree

1 file changed

+5
-22
lines changed

1 file changed

+5
-22
lines changed

.github/workflows/CI.yml

Lines changed: 5 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -49,28 +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://github.com/commercialhaskell/stack/releases/download/v2.3.3/stack-2.3.3-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-
run: |
61-
mkdir -p /home/runner/.local/bin
62-
curl -L https://github.com/commercialhaskell/stack/releases/download/v2.3.3/stack-2.3.3-linux-x86_64.tar.gz | tar --strip-components 1 --wildcards -xz */stack -C /home/runner/.local/bin
63-
64-
- name: Install Haskell Windows
65-
if: contains(matrix.os, 'windows')
66-
run: |
67-
(New-Object System.Net.WebClient).DownloadFile("https://github.com/commercialhaskell/stack/releases/download/v2.3.3/stack-2.3.3-windows-x86_64.zip", "windows-x86_64.zip")
68-
mkdir stack-tmp
69-
cd stack-tmp
70-
unzip ..\windows-x86_64.zip
71-
copy stack.exe "C:\Program Files\Git\usr\bin"
72-
cd ..
73-
7452
- name: Install GFortran Linux
7553
if: contains(matrix.os, 'ubuntu')
7654
run: |
@@ -107,6 +85,11 @@ jobs:
10785
run: |
10886
copy "C:\Users\runneradmin\AppData\Roaming\local\bin\fpm.exe" "C:\Program Files\Git\usr\bin"
10987
88+
- name: put fpm to PATH (Linux)
89+
if: contains(matrix.os, 'ubuntu')
90+
run: |
91+
cp /home/runner/.local/bin/fpm /usr/local/bin
92+
11093
- name: Run tests on Haskell fpm
11194
run: |
11295
cd bootstrap

0 commit comments

Comments
 (0)