Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/cabal2nix
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: f6330be431ce
Choose a base ref
...
head repository: NixOS/cabal2nix
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 4f7064999bac
Choose a head ref
  • 1 commit
  • 1 file changed
  • 1 contributor

Commits on Jan 20, 2021

  1. Disable doctest support. 

    I have to pass an extra search path for doctest to discover the
generated Cabal2nix_Paths module but I couldn't figure out what the
path to that code is. The old location that used to work on
Travis-CI is no longer valid. Needs to be fixed, I guess.
    @peti
    peti committed Jan 20, 2021
    Copy the full SHA
    4f70649 View commit details
Showing with 3 additions and 11 deletions.
  1. +3 −11 .github/workflows/haskell-ci.yml
14 changes: 3 additions & 11 deletions .github/workflows/haskell-ci.yml
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# This GitHub workflow config has been generated by a script via
#
# haskell-ci '--hlint' '--doctest' '--doctest-options=-i ../dist-newstyle/build/*/*/cabal2nix-*/build/autogen' 'github' 'cabal2nix.cabal'
# haskell-ci '--hlint' 'github' 'cabal2nix.cabal'
#
# To regenerate the script (for example after adjusting tested-with) run
#
@@ -10,7 +10,7 @@
#
# version: 0.11.20210111
#
# REGENDATA ("0.11.20210111",["--hlint","--doctest","--doctest-options=-i ../dist-newstyle/build/*/*/cabal2nix-*/build/autogen","github","cabal2nix.cabal"])
# REGENDATA ("0.11.20210111",["--hlint","github","cabal2nix.cabal"])
#
name: Haskell-CI
on:
@@ -92,7 +92,7 @@ jobs:
- name: cache (tools)
uses: actions/cache@v2
with:
key: ${{ runner.os }}-${{ matrix.ghc }}-tools-0f48a857
key: ${{ runner.os }}-${{ matrix.ghc }}-tools-c71e24d1
path: ~/.haskell-ci-tools
- name: install cabal-plan
run: |
@@ -103,10 +103,6 @@ jobs:
rm -f cabal-plan.xz
chmod a+x $HOME/.cabal/bin/cabal-plan
cabal-plan --version
- name: install doctest
run: |
$CABAL --store-dir=$HOME/.haskell-ci-tools/store v2-install $ARG_COMPILER --ignore-project -j2 doctest --constraint='doctest ^>=0.17'
doctest --version
- name: install hlint
run: |
HLINTVER=$(cd /tmp && (${CABAL} v2-install -v $ARG_COMPILER --dry-run hlint --constraint='hlint ==3.2.*' | perl -ne 'if (/\bhlint-(\d+(\.\d+)*)\b/) { print "$1"; last; }')); echo "HLint version $HLINTVER"
@@ -163,10 +159,6 @@ jobs:
- name: tests
run: |
$CABAL v2-test $ARG_COMPILER $ARG_TESTS $ARG_BENCH all --test-show-details=direct
- name: doctest
run: |
cd ${PKGDIR_cabal2nix} || false
doctest -i ../dist-newstyle/build/*/*/cabal2nix-*/build/autogen src
- name: hlint
run: |
(cd ${PKGDIR_cabal2nix} && hlint src)