Skip to content

Commit 7e7fbf3

Browse files
committed
Use one cabal.project
1 parent dcc4938 commit 7e7fbf3

File tree

3 files changed

+16
-58
lines changed

3 files changed

+16
-58
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

+12
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
@@ -41,3 +42,14 @@ index-state: 2021-08-12T12:00:38Z
4142

4243
constraints:
4344
hyphenation +embed
45+
46+
allow-newer:
47+
-- Needed for shake-bench
48+
diagrams-core:base,
49+
diagrams-core:lens,
50+
diagrams-lib:base,
51+
diagrams-lib:lens,
52+
diagrams-svg:base,
53+
diagrams-svg:lens,
54+
dual-tree:base,
55+
svg-builder:base

0 commit comments

Comments
 (0)