Skip to content

Commit f8379bb

Browse files
authored
Fix CI (#4184)
1 parent 463eb2f commit f8379bb

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

.github/workflows/test.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ jobs:
117117
- if: needs.pre_job.outputs.should_skip_ghcide != 'true' && matrix.test
118118
name: Test ghcide
119119
# run the tests without parallelism to avoid running out of memory
120-
run: cabal test ghcide || cabal test ghcide
120+
run: cabal test ghcide-tests || cabal test ghcide-tests
121121

122122
- if: matrix.test
123123
name: Test hls-plugin-api

ghcide/test/exe/TestUtils.hs

+3-3
Original file line numberDiff line numberDiff line change
@@ -248,10 +248,10 @@ runWithExtraFiles prefix s = withTempDir $ \dir -> do
248248
copyTestDataFiles :: FilePath -> FilePath -> IO ()
249249
copyTestDataFiles dir prefix = do
250250
-- Copy all the test data files to the temporary workspace
251-
testDataFiles <- getDirectoryFilesIO ("test/data" </> prefix) ["//*"]
251+
testDataFiles <- getDirectoryFilesIO ("ghcide/test/data" </> prefix) ["//*"]
252252
for_ testDataFiles $ \f -> do
253253
createDirectoryIfMissing True $ dir </> takeDirectory f
254-
copyFile ("test/data" </> prefix </> f) (dir </> f)
254+
copyFile ("ghcide/test/data" </> prefix </> f) (dir </> f)
255255

256256
withLongTimeout :: IO a -> IO a
257257
withLongTimeout = bracket_ (setEnv "LSP_TIMEOUT" "120" True) (unsetEnv "LSP_TIMEOUT")
@@ -263,7 +263,7 @@ lspTestCapsNoFileWatches = lspTestCaps & L.workspace . Lens._Just . L.didChangeW
263263

264264
openTestDataDoc :: FilePath -> Session TextDocumentIdentifier
265265
openTestDataDoc path = do
266-
source <- liftIO $ readFileUtf8 $ "test/data" </> path
266+
source <- liftIO $ readFileUtf8 $ "ghcide/test/data" </> path
267267
createDoc path "haskell" source
268268

269269
pattern R :: UInt -> UInt -> UInt -> UInt -> Range

0 commit comments

Comments
 (0)