aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn MacFarlane <jgm@berkeley.edu>2019-10-02 08:25:22 -0700
committerJohn MacFarlane <jgm@berkeley.edu>2019-10-02 08:25:22 -0700
commitdad5e0d0836043262f66c07aa45bf68b87e11458 (patch)
tree95597fab3f61aed046edefd4926cb2345e0f67b8
parent89c916d830287c52105ae8a9a6af0b7203ddf18c (diff)
downloadpandoc-dad5e0d0836043262f66c07aa45bf68b87e11458.tar.gz
CI tweaks.
-rw-r--r--.github/workflows/ci.yml4
1 files changed, 2 insertions, 2 deletions
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index fb0ca3b33..d180c2012 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -62,7 +62,7 @@ jobs:
sudo apt-get install ghc-${{ matrix.versions.ghc }} cabal-install-${{ matrix.versions.cabal }}
- name: Install dependencies
run: |
- export PATH=/opt/cabal/bin:/opt/ghc/bin:$PATH
+ export PATH=/opt/cabal/${{ matrix.versions.cabal }}/bin:/opt/ghc/${{ matrix.versions.ghc }}/bin:$PATH
cabal v2-update
cabal v2-build --dependencies-only --enable-tests --disable-optimization
- name: Build and test
@@ -70,7 +70,7 @@ jobs:
export PATH=/opt/cabal/bin:/opt/ghc/bin:$PATH
cabal v2-build --enable-tests --disable-optimization 2>&1 | tee build.log
# fail if warnings in local build
- ! grep -q "[Ww]arning:" build.log
+ ! grep -q ": *[Ww]arning:" build.log
cabal v2-test --disable-optimization
windows: