Skip to content

Commit 152cdf4

Browse files
authored
Merge pull request #7497 from fendor/fix/cabal-plan-exe
Force cabal to use a build plan where exe:cabal-plan is enabled
2 parents ec3cf26 + 26b94bb commit 152cdf4

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

.github/workflows/macos.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ jobs:
5151
- name: Install cabal-plan
5252
run: |
5353
cd $(mktemp -d)
54-
cabal v2-install cabal-plan --constraint='cabal-plan ^>=0.6.2.0' --constraint='aeson +fast'
54+
cabal v2-install cabal-plan --constraint='cabal-plan ^>=0.6.2.0' --constraint='aeson +fast' --constraint='cabal-plan +exe'
5555
- uses: actions/checkout@v2
5656
- name: Validate print-config
5757
run: sh validate.sh -j 2 -w ghc-8.8.3 -v -s print-config
@@ -104,7 +104,7 @@ jobs:
104104
- name: Install cabal-plan
105105
run: |
106106
cd $(mktemp -d)
107-
cabal v2-install cabal-plan --constraint='cabal-plan ^>=0.6.2.0' --constraint='aeson +fast'
107+
cabal v2-install cabal-plan --constraint='cabal-plan ^>=0.6.2.0' --constraint='aeson +fast' --constraint='cabal-plan +exe'
108108
- uses: actions/checkout@v2
109109
- name: Validate print-config
110110
run: sh validate.sh -j 2 -w ghc-8.6.5 -v -s print-config

templates/ci-macos.template.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ jobs:
5656
run: |
5757
cd $(mktemp -d)
5858
{# aeson +fast, so we don't wait for -O2 #}
59-
cabal v2-install cabal-plan --constraint='cabal-plan ^>=0.6.2.0' --constraint='aeson +fast'
59+
cabal v2-install cabal-plan --constraint='cabal-plan ^>=0.6.2.0' --constraint='aeson +fast' --constraint='cabal-plan +exe'
6060
- uses: actions/checkout@v2
6161
{% for step in job.steps %}
6262
- name: Validate {{step}}

0 commit comments

Comments
 (0)