Skip to content

Commit 7ce5681

Browse files
jneirayoshitsugu
authored andcommitted
Give unique names to post-jobs (haskell#2337)
1 parent afde479 commit 7ce5681

File tree

4 files changed

+3
-7
lines changed

4 files changed

+3
-7
lines changed

.github/workflows/bench.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -159,7 +159,7 @@ jobs:
159159
ghcide/bench-results/**/*.eventlog
160160
ghcide/bench-results/**/*.hp
161161
162-
post_job:
162+
bench_post_job:
163163
if: always()
164164
runs-on: ubuntu-latest
165165
needs: [pre_job, bench_init, bench_example]

.github/workflows/nix.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ jobs:
107107
if: ${{ env.HAS_TOKEN == 'true' }}
108108
run: nix path-info --json | jq -r '.[].path' | cachix push haskell-language-server
109109

110-
post_job:
110+
nix_post_job:
111111
if: always()
112112
runs-on: ubuntu-latest
113113
needs: [pre_job, develop, build]

.github/workflows/test.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -224,7 +224,7 @@ jobs:
224224
name: Test hls-hlint-plugin test suite
225225
run: cabal test hls-hlint-plugin --test-options="-j1 --rerun-update" || cabal test hls-hlint-plugin --test-options="-j1 --rerun" || LSP_TEST_LOG_COLOR=0 LSP_TEST_LOG_MESSAGES=true LSP_TEST_LOG_STDERR=true cabal test hls-hlint-plugin --test-options="-j1 --rerun"
226226

227-
post_job:
227+
test_post_job:
228228
if: always()
229229
runs-on: ubuntu-latest
230230
needs: [pre_job, test]

ghcide/src/Development/IDE/Core/Rules.hs

-4
Original file line numberDiff line numberDiff line change
@@ -217,10 +217,6 @@ getParsedModuleRule =
217217
let dflags = ms_hspp_opts ms
218218
mainParse = getParsedModuleDefinition hsc opt file ms
219219
reset_ms pm = pm { pm_mod_summary = ms' }
220-
221-
-- Parse again (if necessary) to capture Haddock parse errors
222-
-- We no longer need to parse again if GHC version is above 9.0. https://github.com/haskell/haskell-language-server/issues/1892
223-
res@(_,pmod) <- if Compat.ghcVersion >= Compat.GHC90 || gopt Opt_Haddock dflags
224220
res@(_,pmod) <- if gopt Opt_Haddock dflags
225221
then
226222
liftIO $ (fmap.fmap.fmap) reset_ms mainParse

0 commit comments

Comments
 (0)