From cd91241e0e83535c14f71eb6c0b0533599ef88cd Mon Sep 17 00:00:00 2001 From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> Date: Sat, 5 Jun 2021 19:51:21 +0200 Subject: [PATCH] haskell-ci: patch workflow to skip PackageMap.hs in doctests We use haskell-ci's weird feature to apply a patch to the workflow file in order to not test PackageMap.hs using doctest since it will always fail -- there seems to be no way to install nix in haskell-ci's ubuntu docker containers. We can hopefully drop this if the following issue gets some kind of resolution: https://github.com/haskell-CI/haskell-ci/issues/519 --- .github/workflows/ci-skip-package-map.patch | 13 +++++++++++++ .github/workflows/haskell-ci.yml | 6 +++--- 2 files changed, 16 insertions(+), 3 deletions(-) create mode 100644 .github/workflows/ci-skip-package-map.patch diff --git a/.github/workflows/ci-skip-package-map.patch b/.github/workflows/ci-skip-package-map.patch new file mode 100644 index 0000000..ab6a0a3 --- /dev/null +++ b/.github/workflows/ci-skip-package-map.patch @@ -0,0 +1,13 @@ +diff --git a/.github/workflows/haskell-ci.yml b/.github/workflows/haskell-ci.yml +index 5ed81c0..9bb7e56 100644 +--- a/.github/workflows/haskell-ci.yml ++++ b/.github/workflows/haskell-ci.yml +@@ -179,7 +179,7 @@ jobs: + - name: doctest + run: | + cd ${PKGDIR_distribution_nixpkgs} || false +- doctest -i ../../dist-newstyle/build/*/*/distribution-nixpkgs-*/build/autogen src ++ doctest -i ../../dist-newstyle/build/*/*/distribution-nixpkgs-*/build/autogen src/Distribution/Nixpkgs/Hashes.hs src/Distribution/Nixpkgs/License.hs src/Distribution/Nixpkgs/Meta.hs src/Language/Nix/PrettyPrinting.hs + - name: hlint + run: | + if [ $((HCNUMVER >= 90000)) -ne 0 ] ; then (cd ${PKGDIR_distribution_nixpkgs} && hlint src) ; fi diff --git a/.github/workflows/haskell-ci.yml b/.github/workflows/haskell-ci.yml index 5ed81c0..8b5c271 100644 --- a/.github/workflows/haskell-ci.yml +++ b/.github/workflows/haskell-ci.yml @@ -1,6 +1,6 @@ # This GitHub workflow config has been generated by a script via # -# haskell-ci '--doctest' '--doctest-version=>0.18' '--doctest-options=-i ../../dist-newstyle/build/*/*/distribution-nixpkgs-*/build/autogen' '--hlint' 'github' 'distribution-nixpkgs.cabal' +# haskell-ci '--github-patches' '.github/workflows/ci-skip-package-map.patch' '--doctest' '--doctest-version=>0.18' '--doctest-options=-i ../../dist-newstyle/build/*/*/distribution-nixpkgs-*/build/autogen' '--hlint' 'github' 'distribution-nixpkgs.cabal' # # To regenerate the script (for example after adjusting tested-with) run # @@ -10,7 +10,7 @@ # # version: 0.12.1 # -# REGENDATA ("0.12.1",["--doctest","--doctest-version=>0.18","--doctest-options=-i ../../dist-newstyle/build/*/*/distribution-nixpkgs-*/build/autogen","--hlint","github","distribution-nixpkgs.cabal"]) +# REGENDATA ("0.12.1",["--github-patches",".github/workflows/ci-skip-package-map.patch","--doctest","--doctest-version=>0.18","--doctest-options=-i ../../dist-newstyle/build/*/*/distribution-nixpkgs-*/build/autogen","--hlint","github","distribution-nixpkgs.cabal"]) # name: Haskell-CI on: @@ -179,7 +179,7 @@ jobs: - name: doctest run: | cd ${PKGDIR_distribution_nixpkgs} || false - doctest -i ../../dist-newstyle/build/*/*/distribution-nixpkgs-*/build/autogen src + doctest -i ../../dist-newstyle/build/*/*/distribution-nixpkgs-*/build/autogen src/Distribution/Nixpkgs/Hashes.hs src/Distribution/Nixpkgs/License.hs src/Distribution/Nixpkgs/Meta.hs src/Language/Nix/PrettyPrinting.hs - name: hlint run: | if [ $((HCNUMVER >= 90000)) -ne 0 ] ; then (cd ${PKGDIR_distribution_nixpkgs} && hlint src) ; fi