diff options
| author | Albert Krewinkel <albert@zeitkraut.de> | 2022-07-12 14:24:36 +0200 |
|---|---|---|
| committer | Albert Krewinkel <albert@zeitkraut.de> | 2022-07-12 14:25:50 +0200 |
| commit | 405a31c3fdfd9171991d37bb6538307b25806b35 (patch) | |
| tree | d7b0326fe19e60f9e5b6517bb113733a0d084aaa | |
| parent | c950a281918737ad5f454df27729ad7e09686e23 (diff) | |
CI: remove cabal command prefix.
This was required for older cabal-install versions, but these are no
longer supported.
| -rw-r--r-- | .github/workflows/ci.yml | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index a12e1cf5a..124c50a2f 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -48,27 +48,22 @@ jobs: versions: - ghc: '8.6.5' cabal: '3.2' - prefix: '' cabalopts: '-f-embed_data_files' testopts: '--test-option=--hide-successes --test-option=--ansi-tricks=false' - ghc: '8.8.4' cabal: '3.2' - prefix: '' cabalopts: '' testopts: '--test-option=--hide-successes --test-option=--ansi-tricks=false' - ghc: '8.10.7' cabal: '3.2' - prefix: '' cabalopts: '-ftrypandoc' testopts: '--test-option=--hide-successes --test-option=--ansi-tricks=false' - ghc: '9.0.2' cabal: '3.4' - prefix: '' cabalopts: '' testopts: '--test-option=--hide-successes --test-option=--ansi-tricks=false' - ghc: '9.2.3' cabal: '3.6' - prefix: '' cabalopts: '' testopts: '--test-option=--hide-successes --test-option=--ansi-tricks=false' steps: @@ -105,15 +100,15 @@ jobs: - name: Install dependencies run: | - cabal ${{ matrix.versions.prefix }}update - cabal ${{ matrix.versions.prefix }}build ${{ matrix.versions.cabalopts }} --dependencies-only --enable-tests --disable-optimization + cabal update + cabal build ${{ matrix.versions.cabalopts }} --dependencies-only --enable-tests --disable-optimization - name: Build and test run: | - cabal ${{ matrix.versions.prefix }}build ${{ matrix.versions.cabalopts }} --enable-tests --disable-optimization 2>&1 | tee build.log + cabal build ${{ matrix.versions.cabalopts }} --enable-tests --disable-optimization 2>&1 | tee build.log # fail if warnings in local build ! grep -q ": *[Ww]arning:" build.log || exit 1 - cabal ${{ matrix.versions.prefix }}test ${{ matrix.versions.cabalopts }} --disable-optimization ${{ matrix.versions.testopts }} + cabal test ${{ matrix.versions.cabalopts }} --disable-optimization ${{ matrix.versions.testopts }} windows: |