From 26b94bbfe5b4a6ca3e110c4276bbb98ff296e235 Mon Sep 17 00:00:00 2001 From: Fendor Date: Tue, 27 Jul 2021 12:56:14 +0200 Subject: [PATCH] Force cabal to use a build plan where exe:cabal-plan is enabled --- .github/workflows/macos.yml | 4 ++-- templates/ci-macos.template.yml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml index 5898d0c2776..eb763749127 100644 --- a/.github/workflows/macos.yml +++ b/.github/workflows/macos.yml @@ -51,7 +51,7 @@ jobs: - name: Install cabal-plan run: | cd $(mktemp -d) - cabal v2-install cabal-plan --constraint='cabal-plan ^>=0.6.2.0' --constraint='aeson +fast' + cabal v2-install cabal-plan --constraint='cabal-plan ^>=0.6.2.0' --constraint='aeson +fast' --constraint='cabal-plan +exe' - uses: actions/checkout@v2 - name: Validate print-config run: sh validate.sh -j 2 -w ghc-8.8.3 -v -s print-config @@ -104,7 +104,7 @@ jobs: - name: Install cabal-plan run: | cd $(mktemp -d) - cabal v2-install cabal-plan --constraint='cabal-plan ^>=0.6.2.0' --constraint='aeson +fast' + cabal v2-install cabal-plan --constraint='cabal-plan ^>=0.6.2.0' --constraint='aeson +fast' --constraint='cabal-plan +exe' - uses: actions/checkout@v2 - name: Validate print-config run: sh validate.sh -j 2 -w ghc-8.6.5 -v -s print-config diff --git a/templates/ci-macos.template.yml b/templates/ci-macos.template.yml index 57ef1b9a911..f4a8f3f3443 100644 --- a/templates/ci-macos.template.yml +++ b/templates/ci-macos.template.yml @@ -56,7 +56,7 @@ jobs: run: | cd $(mktemp -d) {# aeson +fast, so we don't wait for -O2 #} - cabal v2-install cabal-plan --constraint='cabal-plan ^>=0.6.2.0' --constraint='aeson +fast' + cabal v2-install cabal-plan --constraint='cabal-plan ^>=0.6.2.0' --constraint='aeson +fast' --constraint='cabal-plan +exe' - uses: actions/checkout@v2 {% for step in job.steps %} - name: Validate {{step}}