From 3b988c733521dedbfa4a775222edc3b6abd166a9 Mon Sep 17 00:00:00 2001 From: Brad Richardson Date: Tue, 25 Feb 2020 10:05:54 -0800 Subject: CI: Install Haskell instead of Rust --- .github/workflows/CI.yml | 19 ++++--------------- 1 file changed, 4 insertions(+), 15 deletions(-) (limited to '.github/workflows') diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index fcc50b6..c73bb3b 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,8 @@ 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 + uses: mstksg/setup-stack@v1 - name: Install GFortran Linux if: contains(matrix.os, 'ubuntu') @@ -42,16 +37,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 -- cgit v1.2.3 From 2fffd79862b5c0bf2f6d02bb2dee1f25d63b22bc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20=C4=8Cert=C3=ADk?= Date: Tue, 25 Feb 2020 10:57:26 -0800 Subject: CI: Install Haskell on Windows manually --- .github/workflows/CI.yml | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) (limited to '.github/workflows') diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index c73bb3b..37ca589 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -27,9 +27,17 @@ jobs: - name: Checkout code uses: actions/checkout@v1 - - name: Install Haskell + - name: Install Haskell Linux / macOS + if: contains(matrix.os, 'ubuntu') or contains(matrix.os, 'macos') uses: mstksg/setup-stack@v1 + - name: Install Haskell Windows + if: contains(matrix.os, 'windows') + run: | + wget https://get.haskellstack.org/stable/windows-x86_64.zip + unzip windows-x86_64.zip + copy windows-x86_64\stack.exe %APPDATA%\local\bin + - name: Install GFortran Linux if: contains(matrix.os, 'ubuntu') run: | -- cgit v1.2.3 From 1e022ab28087ac52c2318c5030d5a74bd736ac8e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20=C4=8Cert=C3=ADk?= Date: Tue, 25 Feb 2020 11:06:31 -0800 Subject: CI: Use "||" instead of "or" --- .github/workflows/CI.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to '.github/workflows') diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index 37ca589..3f6d81a 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -28,7 +28,7 @@ jobs: uses: actions/checkout@v1 - name: Install Haskell Linux / macOS - if: contains(matrix.os, 'ubuntu') or contains(matrix.os, 'macos') + if: contains(matrix.os, 'ubuntu') || contains(matrix.os, 'macos') uses: mstksg/setup-stack@v1 - name: Install Haskell Windows -- cgit v1.2.3 From 2d6a18354b5c848bd655bfc2a642b93699eb2b09 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20=C4=8Cert=C3=ADk?= Date: Tue, 25 Feb 2020 11:16:21 -0800 Subject: CI: use PowerShell to download Stack --- .github/workflows/CI.yml | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to '.github/workflows') diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index 3f6d81a..946caba 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -34,9 +34,12 @@ jobs: - name: Install Haskell Windows if: contains(matrix.os, 'windows') run: | - wget https://get.haskellstack.org/stable/windows-x86_64.zip - unzip windows-x86_64.zip - copy windows-x86_64\stack.exe %APPDATA%\local\bin + (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') -- cgit v1.2.3