Skip to content

Commit 219e511

Browse files
committed
CI: flags: post-review fxs
1 parent dc5c389 commit 219e511

File tree

1 file changed

+5
-15
lines changed

1 file changed

+5
-15
lines changed

.github/workflows/flags.yml

+5-15
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ jobs:
1919
runs-on: ubuntu-latest
2020
outputs:
2121
should_skip: ${{ steps.skip_check.outputs.should_skip }}
22-
should_skip_ghcide: ${{ steps.skip_ghcide_check.outputs.should_skip }}
2322
steps:
2423
- id: skip_check
2524
uses: fkirc/[email protected]
@@ -36,18 +35,6 @@ jobs:
3635
, ".circleci/**"
3736
, "**/stack*.yaml"
3837
]'
39-
# If we only change ghcide downstream packages we have not test ghcide itself
40-
- id: skip_ghcide_check
41-
uses: fkirc/[email protected]
42-
with:
43-
cancel_others: false
44-
paths_ignore: '[ "hls-test-utils/**"
45-
, "plugins/**"
46-
, "src/**"
47-
, "exe/**"
48-
, "test/**"
49-
, "shake-bench/**"
50-
]'
5138

5239
flags:
5340
if: needs.pre_job.outputs.should_skip != 'true'
@@ -131,6 +118,10 @@ jobs:
131118
${{ env.cache-name }}-${{ runner.os }}-${{ matrix.ghc }}-
132119
${{ env.cache-name }}-${{ runner.os }}-
133120
121+
# To ensure we get the lastest hackage index and not relying on haskell action logic
122+
- if: steps.compiled-deps.outputs.cache-hit != 'true'
123+
run: cabal update
124+
134125
- name: Build `hls-graph` with flags
135126
run: cabal v2-build hls-graph --flags="pedantic embed-files stm-stats"
136127

@@ -143,9 +134,8 @@ jobs:
143134
- name: Build `hls-test-utils` with flags
144135
run: cabal v2-build hls-test-utils --flags="pedantic"
145136

146-
# repeating builds to workaround segfaults in windows and ghc-8.8.4
147137
- name: Build
148-
run: cabal v2-build ghcide --flags="ghc-patched-unboxed-bytecode test-exe executable bench-exe" || cabal v2-build ghcide --flags="ghc-patched-unboxed-bytecode test-exe executable bench-exe" || cabal v2-build ghcide --flags="ghc-patched-unboxed-bytecode test-exe executable bench-exe"
138+
run: cabal v2-build ghcide --flags="ghc-patched-unboxed-bytecode test-exe executable bench-exe"
149139

150140
flags_post_job:
151141
if: always()

0 commit comments

Comments
 (0)