diff --git a/.github/workflows/run-integration-test.yml b/.github/workflows/run-integration-test.yml index 7540062..3888f74 100644 --- a/.github/workflows/run-integration-test.yml +++ b/.github/workflows/run-integration-test.yml @@ -111,8 +111,8 @@ jobs: strategy: matrix: target: - - "'flybytes' 'php-analysis' 'rascal-git' 'salix-core' 'drambiguity' 'salix-contrib' 'rascal-all'" - - "'typepal' 'rascal-lsp' 'rascal-core'" + - "'rascal-lsp' 'flybytes' 'php-analysis' 'rascal-git' 'salix-core' 'drambiguity' 'salix-contrib' 'rascal-all'" + - "'typepal' 'rascal-lsp-all' 'rascal-core'" fail-fast: false needs: [rascal, prepare-deps] steps: diff --git a/.github/workflows/smoke-tests.yml b/.github/workflows/smoke-tests.yml index 937295a..b5f5460 100644 --- a/.github/workflows/smoke-tests.yml +++ b/.github/workflows/smoke-tests.yml @@ -76,4 +76,4 @@ jobs: --full false \ --clean \ --printWarnings \ - --tests rascal typepal salix-core salix-contrib flybytes + --tests rascal typepal salix-core salix-contrib flybytes rascal-lsp diff --git a/src/main/rascal/Main.rsc b/src/main/rascal/Main.rsc index 64f8363..4eff414 100644 --- a/src/main/rascal/Main.rsc +++ b/src/main/rascal/Main.rsc @@ -35,7 +35,8 @@ Projects projects = { <"rascal-git", project(|https://github.com/cwi-swat/rascal-git.git|, {"rascal"})>, <"php-analysis", project(|https://github.com/cwi-swat/php-analysis.git|, {"rascal", "rascal-git"})>, <"rascal-core", project(|https://github.com/usethesource/rascal-core.git|, {"rascal", "typepal"}, branch="master")>, - <"rascal-lsp", project(|https://github.com/usethesource/rascal-language-servers.git|, {"rascal", "typepal", "rascal-core"}, subdir="rascal-lsp")> + <"rascal-lsp-all", project(|https://github.com/usethesource/rascal-language-servers.git|, {"rascal", "typepal", "rascal-core"}, subdir="rascal-lsp")>, + <"rascal-lsp", project(|https://github.com/usethesource/rascal-language-servers.git|, {"rascal"}, ignores={"lang/rascal/lsp/refactor", "lang/rascal/tests/rename"}, subdir="rascal-lsp")> }; bool isWindows = /win/i := getSystemProperty("os.name");