Skip to content

Commit 19bb487

Browse files
committed
Use one cabal.project
1 parent d62bd39 commit 19bb487

File tree

3 files changed

+5
-85
lines changed

3 files changed

+5
-85
lines changed

.github/workflows/bench.yml

+4-4
Original file line numberDiff line numberDiff line change
@@ -58,17 +58,17 @@ jobs:
5858
# max-backjumps is increased as a temporary solution
5959
# for dependency resolution failure
6060
- if: ${{ needs.pre_job.outputs.should_skip != 'true' }}
61-
run: cabal configure --enable-benchmarks --max-backjumps 12000 --project-file cabal-benchmark.project
61+
run: cabal configure --enable-benchmarks --max-backjumps 12000
6262

6363
- if: ${{ needs.pre_job.outputs.should_skip != 'true' }}
6464
name: Build
6565
shell: bash
66-
run: cabal build ghcide:benchHist --project-file cabal-benchmark.project
66+
run: cabal build ghcide:benchHist
6767

6868
- if: ${{ needs.pre_job.outputs.should_skip != 'true' }}
6969
name: Bench init
7070
shell: bash
71-
run: cabal bench ghcide:benchHist -j --benchmark-options="all-binaries" --project-file cabal-benchmark.project
71+
run: cabal bench ghcide:benchHist -j --benchmark-options="all-binaries"
7272

7373
# tar is required to preserve file permissions
7474
# compression speeds up upload/download nicely
@@ -142,7 +142,7 @@ jobs:
142142
- if: ${{ needs.pre_job.outputs.should_skip != 'true' }}
143143
name: Bench
144144
shell: bash
145-
run: cabal bench ghcide:benchHist -j --benchmark-options="${{ matrix.example }}" --project-file cabal-benchmark.project
145+
run: cabal bench ghcide:benchHist -j --benchmark-options="${{ matrix.example }}"
146146

147147
- if: ${{ needs.pre_job.outputs.should_skip != 'true' }}
148148
name: Display results

cabal-benchmark.project

-54
This file was deleted.

cabal.project

+1-27
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
packages:
22
./
33
./hie-compat
4+
./shake-bench
45
./hls-graph
56
./ghcide
67
./hls-plugin-api
@@ -44,33 +45,6 @@ constraints:
4445

4546

4647
allow-newer:
47-
active:base,
48-
assoc:base,
49-
cryptohash-md5:base,
50-
cryptohash-sha1:base,
51-
constraints-extras:template-haskell,
52-
data-tree-print:base,
53-
deepseq:base,
54-
dependent-sum:some,
55-
dependent-sum:constraints,
56-
dual-tree:base,
57-
-- Does this make any sense?
58-
entropy:Cabal,
59-
force-layout:base,
60-
force-layout:lens,
61-
floskell:ghc-prim,
62-
floskell:base,
63-
hashable:base,
64-
hslogger:base,
65-
monoid-extras:base,
66-
newtype-generics:base,
67-
parallel:base,
68-
regex-base:base,
69-
regex-tdfa:base,
70-
statestack:base,
71-
these:base,
72-
time-compat:base,
73-
7448
-- for shake-bench
7549
Chart-diagrams:diagrams-core,
7650
SVGFonts:diagrams-core

0 commit comments

Comments
 (0)