diff options
| author | Brad Richardson <everythingfunctional@protonmail.com> | 2020-02-25 14:00:21 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-02-25 14:00:21 -0800 |
| commit | 5d38dffc1023cef688e055019fa2569618cf1a4d (patch) | |
| tree | 7b13ccc55588d467708c20f14b114cc56bb93b0b /.github | |
| parent | 2292bbd1d57c97d800e87e1cb6ccd1981ad50333 (diff) | |
| parent | d9cd40f9d84e104207f8ef34c6d5a4f9d1b3af4b (diff) | |
| download | fpm-5d38dffc1023cef688e055019fa2569618cf1a4d.tar.gz fpm-5d38dffc1023cef688e055019fa2569618cf1a4d.zip | |
Merge pull request #40 from everythingfunctional/master
Switch to using Haskell
Diffstat (limited to '.github')
| -rw-r--r-- | .github/workflows/CI.yml | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index fcc50b6..946caba 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -4,9 +4,6 @@ on: [push, pull_request] env: CI: "ON" # We can detect this in the build system and other vendors implement it - CMAKE_BUILD_PARALLEL_LEVEL: "2" # 2 cores on each GHA VM, enable parallel builds - CTEST_OUTPUT_ON_FAILURE: "ON" # This way we don't need a flag to ctest - CTEST_PARALLEL_LEVEL: "2" HOMEBREW_NO_ANALYTICS: "ON" # Make Homebrew installation a little quicker HOMEBREW_NO_AUTO_UPDATE: "ON" HOMEBREW_NO_BOTTLE_SOURCE_FALLBACK: "ON" @@ -22,7 +19,6 @@ jobs: matrix: os: [ubuntu-latest, macos-latest, windows-latest] gcc_v: [9] # Version of GFortran we want to use. - rust: [stable] env: FC: gfortran GCC_V: ${{ matrix.gcc_v }} @@ -31,9 +27,19 @@ jobs: - name: Checkout code uses: actions/checkout@v1 - - name: Install CMake Linux - if: contains(matrix.os, 'ubuntu') - run: ci/install_cmake.sh + - name: Install Haskell Linux / macOS + if: contains(matrix.os, 'ubuntu') || contains(matrix.os, 'macos') + uses: mstksg/setup-stack@v1 + + - name: Install Haskell Windows + if: contains(matrix.os, 'windows') + run: | + (New-Object System.Net.WebClient).DownloadFile("https://get.haskellstack.org/stable/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') @@ -42,16 +48,10 @@ jobs: --slave /usr/bin/gfortran gfortran /usr/bin/gfortran-${GCC_V} \ --slave /usr/bingcov gcov /usr/bin/gcov-${GCC_V} - - - name: Install Rust - uses: hecrj/setup-rust-action@v1 - with: - rust-version: ${{ matrix.rust }} - - name: Build run: | - cargo test --verbose --no-run + stack build - name: Run tests run: | - cargo test + stack test |