aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.github/workflows/CI.yml27
1 files changed, 5 insertions, 22 deletions
diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml
index 597b385..f71f2ee 100644
--- a/.github/workflows/CI.yml
+++ b/.github/workflows/CI.yml
@@ -49,28 +49,6 @@ jobs:
which gfortran-${GCC_V}
which gfortran
- - name: Install Haskell macOS
- if: contains(matrix.os, 'macos')
- run: |
- mkdir /Users/runner/.local/bin
- 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
-
- - name: Install Haskell Linux
- if: contains(matrix.os, 'ubuntu')
- run: |
- mkdir -p /home/runner/.local/bin
- 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
-
- - name: Install Haskell Windows
- if: contains(matrix.os, 'windows')
- run: |
- (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")
- mkdir stack-tmp
- cd stack-tmp
- unzip ..\windows-x86_64.zip
- copy stack.exe "C:\Program Files\Git\usr\bin"
- cd ..
-
- name: Install GFortran Linux
if: contains(matrix.os, 'ubuntu')
run: |
@@ -107,6 +85,11 @@ jobs:
run: |
copy "C:\Users\runneradmin\AppData\Roaming\local\bin\fpm.exe" "C:\Program Files\Git\usr\bin"
+ - name: put fpm to PATH (Linux)
+ if: contains(matrix.os, 'ubuntu')
+ run: |
+ cp /home/runner/.local/bin/fpm /usr/local/bin
+
- name: Run tests on Haskell fpm
run: |
cd bootstrap