diff options
| author | John MacFarlane <[email protected]> | 2025-07-23 14:09:34 -0700 |
|---|---|---|
| committer | John MacFarlane <[email protected]> | 2025-07-23 14:10:43 -0700 |
| commit | fb28952bec116fcf1b3d8e7848373004b66a4fe7 (patch) | |
| tree | 94db3a293b3c9047fa217d4e42b1fa3b706423eb /.github | |
| parent | 7ec7efeee72a537a2a8519887321edff96551210 (diff) | |
Revise Makefile and CI treatment of `--ghc-options`.
Previously we set `--ghc-options` in Makefile and CI; but this
overrides the ghc-options set in the pandoc.cabal file.
Better to add options one-by-one using `--ghc-option`.
We no longer use GHC_OPTIONS and just put these extra options
in CABAL_OPTIONS.
Diffstat (limited to '.github')
| -rw-r--r-- | .github/workflows/ci.yml | 28 |
1 files changed, 10 insertions, 18 deletions
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index c156e4967..00135c94d 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -50,36 +50,28 @@ jobs: versions: - ghc: '8.10' cabal: 'latest' - cabalopts: '' - ghcopts: '-Werror' + cabalopts: '--ghc-option=-Werror' - ghc: '9.0' cabal: 'latest' - cabalopts: '' - ghcopts: '-Werror' + cabalopts: '--ghc-option=-Werror' - ghc: '9.2' cabal: 'latest' - cabalopts: '' - ghcopts: '-Werror' + cabalopts: '--ghc-option=-Werror' - ghc: '9.4' cabal: 'latest' - cabalopts: '' - ghcopts: '-Werror' + cabalopts: '--ghc-option=-Werror' - ghc: '9.6' cabal: 'latest' - cabalopts: '' - ghcopts: '-Werror' + cabalopts: '--ghc-option=-Werror' - ghc: '9.8' cabal: 'latest' - cabalopts: '' - ghcopts: '-Werror' + cabalopts: '--ghc-option=-Werror' - ghc: '9.10' cabal: 'latest' - cabalopts: '' - ghcopts: '' + cabalopts: '--ghc-option=-Werror' - ghc: '9.12' cabal: 'latest' - cabalopts: '--allow-newer' - ghcopts: '' + cabalopts: '--allow-newer --ghc-option=-Werror' steps: - uses: actions/checkout@v4 @@ -120,8 +112,8 @@ jobs: - name: Build and test run: | - cabal build ${{ matrix.versions.cabalopts }} --enable-tests --disable-optimization --ghc-options="${{ matrix.verisons.ghcopts }}" all - cabal test ${{ matrix.versions.cabalopts }} --disable-optimization --ghc-options="${{ matrix.verisons.ghcopts }}" all + cabal build ${{ matrix.versions.cabalopts }} --enable-tests --disable-optimization all + cabal test ${{ matrix.versions.cabalopts }} --disable-optimization all linux-stack: |