Give unique names to post-jobs (#2337)

haskell · Nov 12, 2021 · 7ce5681 · 7ce5681
1 parent afde479
commit 7ce5681
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 7 deletions.
diff --git a/.github/workflows/bench.yml b/.github/workflows/bench.yml
@@ -159,7 +159,7 @@ jobs:
            ghcide/bench-results/**/*.eventlog
            ghcide/bench-results/**/*.hp
 
-  post_job:
+  bench_post_job:
     if: always()
     runs-on: ubuntu-latest
     needs: [pre_job, bench_init, bench_example]

diff --git a/.github/workflows/nix.yml b/.github/workflows/nix.yml
@@ -107,7 +107,7 @@ jobs:
       if: ${{ env.HAS_TOKEN == 'true' }}
       run: nix path-info --json | jq -r '.[].path' | cachix push haskell-language-server
 
-  post_job:
+  nix_post_job:
     if: always()
     runs-on: ubuntu-latest
     needs: [pre_job, develop, build]

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -224,7 +224,7 @@ jobs:
         name: Test hls-hlint-plugin test suite
         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"
 
-  post_job:
+  test_post_job:
     if: always()
     runs-on: ubuntu-latest
     needs: [pre_job, test]

diff --git a/ghcide/src/Development/IDE/Core/Rules.hs b/ghcide/src/Development/IDE/Core/Rules.hs
@@ -217,10 +217,6 @@ getParsedModuleRule =
     let dflags    = ms_hspp_opts ms
         mainParse = getParsedModuleDefinition hsc opt file ms
         reset_ms pm = pm { pm_mod_summary = ms' }
-
-    -- Parse again (if necessary) to capture Haddock parse errors
-    -- We no longer need to parse again if GHC version is above 9.0. https://github.com/haskell/haskell-language-server/issues/1892
-    res@(_,pmod) <- if Compat.ghcVersion >= Compat.GHC90 || gopt Opt_Haddock dflags
     res@(_,pmod) <- if gopt Opt_Haddock dflags
         then
             liftIO $ (fmap.fmap.fmap) reset_ms mainParse