Skip to content

Commit 4aefaf1

Browse files
committed
For rascal-all, always use the current typechecker branch
1 parent 269ed29 commit 4aefaf1

File tree

2 files changed

+4
-3
lines changed

2 files changed

+4
-3
lines changed

.github/workflows/run-integration-test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ jobs:
6161
env:
6262
JAVA_TOOL_OPTIONS: "-Djava.io.tmpdir=${{ runner.temp }}"
6363
run: |
64-
java -Xmx500m -jar ${{ runner.temp }}/rascal.jar Main \
64+
java -DRASCAL_ALL_BRANCH="${{ inputs.rascal_version }}" -Xmx500m -jar ${{ runner.temp }}/rascal.jar Main \
6565
--libs "${{ inputs.dependencies_on_lib_path }}" \
6666
--maxCores 4 \
6767
--memory 14G \

src/main/rascal/Main.rsc

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ import Location;
77
import util::Reflective;
88
import util::SystemAPI;
99
import util::FileSystem;
10+
import util::SystemAPI;
1011
import analysis::graphs::Graph;
1112
import util::ShellExec;
1213
import util::Benchmark;
@@ -28,7 +29,7 @@ alias Projects = rel[str name, Project config];
2829

2930
Projects projects = {
3031
<"rascal", project(|https://github.com/usethesource/rascal.git|, {}, srcs = ["src/org/rascalmpl/library"], ignores={"experiments", "resource", "lang/rascal/tests", "lang/rascal/syntax/test"}, parallel = true, parallelPreCheck = {"src/org/rascalmpl/library/Prelude.rsc"})>,
31-
<"rascal-all", project(|https://github.com/usethesource/rascal.git|, {}, ignores={"lang/rascal/tutor/examples"}, parallel = true, parallelPreCheck = {"src/org/rascalmpl/library/Prelude.rsc", "src/org/rascalmpl/compiler/lang/rascalcore/check/CheckerCommon.rsc"})>,
32+
<"rascal-all", project(|https://github.com/usethesource/rascal.git|, {}, branch=(getSystemProperties()["RASCAL_ALL_BRANCH"] ? "main"), ignores={"lang/rascal/tutor/examples", "NestedOr.rsc"}, parallel = true, parallelPreCheck = {"src/org/rascalmpl/library/Prelude.rsc", "src/org/rascalmpl/compiler/lang/rascalcore/check/CheckerCommon.rsc"})>,
3233
<"typepal", project(|https://github.com/usethesource/typepal.git|, {"rascal"}, ignores={"examples"})>,
3334
<"typepal-boot", project(|https://github.com/usethesource/typepal.git|, {}, rascalLib=true, ignores={"examples"})>,
3435
<"salix-core", project(|https://github.com/usethesource/salix-core.git|, {"rascal"})>,
@@ -138,7 +139,7 @@ int updateRepos(Projects projs, loc repoFolder, bool full) {
138139
}
139140

140141
bool isIgnored(loc f, list[loc] ignores)
141-
= size(ignores) > 0 && any(i <- ignores, relativize(i, f) != f);
142+
= size(ignores) > 0 && any(i <- ignores, (relativize(i, f) != f || i == f));
142143

143144
list[str] addParallalFlags(Project proj, PathConfig pcfg, list[loc] rascalFiles, int maxCores) {
144145
if (!proj.parallel) {

0 commit comments

Comments
 (0)