From 5537802dc93e1d204c6d0e5902099eb5b94b130e Mon Sep 17 00:00:00 2001
From: John MacFarlane <jgm@berkeley.edu>
Date: Sun, 28 Feb 2021 18:33:04 -0800
Subject: Fix CI for older cabal versions.

We add fields to matrix.versions to handle the cabal
command prefix (v2-, new-, nothing) and whether `--test-option`
is supported.
---
 .github/workflows/ci.yml | 23 ++++++++++++++++-------
 1 file changed, 16 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index c2ff45249..b9c5225f3 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -45,16 +45,28 @@ jobs:
         versions:
           - ghc: '8.0.2'
             cabal: '2.2'
+            prefix: 'new-'
+            testopts: ''
           - ghc: '8.2.2'
             cabal: '2.4'
+            prefix: 'v2-'
+            testopts: ''
           - ghc: '8.4.4'
             cabal: '2.4'
+            prefix: 'v2-'
+            testopts: ''
           - ghc: '8.6.5'
             cabal: '3.2'
+            prefix: ''
+            testopts: '--test-option=--hide-successes'
           - ghc: '8.8.4'
             cabal: '3.2'
+            prefix: ''
+            testopts: '--test-option=--hide-successes'
           - ghc: '8.10.2'
             cabal: '3.2'
+            prefix: ''
+            testopts: '--test-option=--hide-successes'
     steps:
     - uses: actions/checkout@v2
 
@@ -88,18 +100,15 @@ jobs:
 
     - name: Install dependencies
       run: |
-          v2=$([ "${{ matrix.versions.cabal }}" = "2.2" ] && printf 'new' || printf 'v2')
-          cabal $v2-update
-          cabal $v2-build --dependencies-only --enable-tests --disable-optimization
+          cabal ${{ matrix.versions.prefix }}update
+          cabal ${{ matrix.versions.prefix }}build --dependencies-only --enable-tests --disable-optimization
 
     - name: Build and test
       run: |
-          v2=$([ "${{ matrix.versions.cabal }}" = "2.2" ] && printf 'new' || printf 'v2')
-          testopts=$([ "${{ matrix.versions.cabal }}" != "2.2" ] && [ "${{ matrix.versions.cabal }}" != "2.4" ] && printf '--test-option=--hide-successes')
-          cabal $v2-build --enable-tests --disable-optimization 2>&1 | tee build.log
+          cabal ${{ matrix.versions.prefix }}build --enable-tests --disable-optimization 2>&1 | tee build.log
           # fail if warnings in local build
           ! grep -q ": *[Ww]arning:" build.log || exit 1
-          cabal $v2-test --disable-optimization $testopts
+          cabal ${{ matrix.versions.prefix }}test --disable-optimization ${{ matrix.versions.testopts }}
 
   windows:
 
-- 
cgit v1.2.3