Skip to content

Commit e55964b

Browse files
committed
Avoid running tests for CodeQL workflow
1 parent 644d552 commit e55964b

File tree

4 files changed

+49
-24
lines changed

4 files changed

+49
-24
lines changed

.github/workflows/codeql.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,7 @@ jobs:
3434
languages: ${{ matrix.language }}
3535
build-mode: ${{ matrix.build-mode }}
3636
- if: matrix.build-mode == 'manual'
37-
# TODO compile only, avoid running tests
38-
run: java src/Builder.java
37+
run: java src/Builder.java --target=compile
3938
- name: Perform CodeQL Analysis
4039
uses: github/codeql-action/analyze@ce28f5bb42b7a9f2c824e633a3f6ee835bab6858 # v3.29.0
4140
with:

junit5-jupiter-starter-ant/build.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,4 +31,4 @@ fi
3131
#
3232
# Finally, let Ant do its work...
3333
#
34-
ANT_HOME=${ant_folder} "./${ant_folder}/bin/ant"
34+
ANT_HOME=${ant_folder} "./${ant_folder}/bin/ant" "$@"

junit5-modular-world/build.jsh

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,10 @@ del("lib")
99

1010
exe("jshell", "compile.jsh")
1111

12-
exe("jshell", "test-classpath.jsh")
13-
exe("jshell", "test-patch-compile.jsh")
14-
exe("jshell", "test-patch-runtime.jsh")
12+
if ("TEST".equalsIgnoreCase(System.getProperty("target"))) {
13+
exe("jshell", "test-classpath.jsh");
14+
exe("jshell", "test-patch-compile.jsh");
15+
exe("jshell", "test-patch-runtime.jsh");
16+
}
1517

1618
/exit

src/Builder.java

Lines changed: 42 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -25,50 +25,70 @@
2525
@SuppressWarnings({ "WeakerAccess", "SameParameterValue" })
2626
class Builder {
2727

28-
private static final java.lang.String EXCLUDE_OPTION = "--exclude=";
28+
private static final String TARGET_OPTION = "--target=";
29+
private static final String EXCLUDE_OPTION = "--exclude=";
2930

3031
public static void main(String[] args) {
32+
var target = determineTarget(args);
3133
var excludedProjects = determineExcludedProjects(args);
32-
var status = new Builder().build(excludedProjects);
34+
var status = new Builder().build(target, excludedProjects);
3335
if (status != 0) {
3436
throw new AssertionError("Expected exit status of zero, but got: " + status);
3537
}
3638
}
3739

3840
int status = 0;
3941

40-
int build(Set<String> excludedProjects) {
41-
System.out.printf("|%n| Building all samples...%n|%n");
42+
int build(Target target, Set<String> excludedProjects) {
43+
System.out.printf("|%n| Building all samples (%s)...%n|%n", target);
4244
run(".", "java", "--version");
43-
checkLicense("src/eclipse-public-license-2.0.java", ".java", ".kt", ".scala", ".groovy");
45+
if (target == Target.TEST) {
46+
checkLicense("src/eclipse-public-license-2.0.java", ".java", ".kt", ".scala", ".groovy");
47+
}
48+
49+
var antTarget = target == Target.TEST ? "test" : "compile";
50+
var gradleTask = target == Target.TEST ? "test" : "testClasses";
51+
var mavenLifecycle = target == Target.TEST ? "test" : "test-compile";
52+
var bazelTarget = target == Target.TEST ? "test" : "build";
53+
var sbtTask = target == Target.TEST ? "test" : "Test / compile";
4454

4555
// jupiter-starter
4656
if (!isWindows()) { // TODO https://github.com/junit-team/junit5-samples/issues/66
47-
runProject(excludedProjects, "junit5-jupiter-starter-ant", "build.sh");
57+
runProject(excludedProjects, "junit5-jupiter-starter-ant", "build.sh", "clean", antTarget);
4858
}
49-
runProject(excludedProjects, "junit5-jupiter-starter-gradle", "gradlew", "test");
50-
runProject(excludedProjects, "junit5-jupiter-starter-gradle-groovy", "gradlew", "test");
51-
runProject(excludedProjects, "junit5-jupiter-starter-gradle-kotlin", "gradlew", "test");
52-
runProject(excludedProjects, "junit5-jupiter-starter-maven", "mvnw", "--batch-mode", "clean", "test");
53-
runProject(excludedProjects, "junit5-jupiter-starter-maven-kotlin", "mvnw", "--batch-mode", "clean", "test");
54-
runProject(excludedProjects, "junit5-jupiter-starter-bazel", "bazel", "test", "//...", "--test_output", "all");
55-
runProject(excludedProjects, "junit5-jupiter-starter-sbt", "sbt", "test");
59+
60+
runProject(excludedProjects, "junit5-jupiter-starter-gradle", "gradlew", gradleTask);
61+
runProject(excludedProjects, "junit5-jupiter-starter-gradle-groovy", "gradlew", gradleTask);
62+
runProject(excludedProjects, "junit5-jupiter-starter-gradle-kotlin", "gradlew", gradleTask);
63+
runProject(excludedProjects, "junit5-jupiter-starter-maven", "mvnw", "--batch-mode", "clean", mavenLifecycle);
64+
runProject(excludedProjects, "junit5-jupiter-starter-maven-kotlin", "mvnw", "--batch-mode", "clean", mavenLifecycle);
65+
runProject(excludedProjects, "junit5-jupiter-starter-bazel", "bazel", bazelTarget, "//...", "--test_output", "all");
66+
runProject(excludedProjects, "junit5-jupiter-starter-sbt", "sbt", sbtTask);
5667

5768
// jupiter-extensions
58-
runProject(excludedProjects, "junit5-jupiter-extensions", "gradlew", "test");
69+
runProject(excludedProjects, "junit5-jupiter-extensions", "gradlew", gradleTask);
5970

6071
// migration
61-
runProject(excludedProjects, "junit5-migration-gradle", "gradlew", "test");
62-
runProject(excludedProjects, "junit5-migration-maven", "mvnw", "--batch-mode", "clean", "test");
63-
runProject(excludedProjects, "junit5-multiple-engines", "gradlew", "test");
72+
runProject(excludedProjects, "junit5-migration-gradle", "gradlew", gradleTask);
73+
runProject(excludedProjects, "junit5-migration-maven", "mvnw", "--batch-mode", "clean", mavenLifecycle);
74+
runProject(excludedProjects, "junit5-multiple-engines", "gradlew", gradleTask);
6475

6576
// modular
66-
runProject(excludedProjects, "junit5-modular-world", "jshell", "build.jsh");
77+
runProject(excludedProjects, "junit5-modular-world", "jshell", "-R-Dtarget=" + target.name(), "build.jsh");
6778

6879
System.out.printf("%n%n%n|%n| Done. Build exits with status = %d.%n|%n", status);
6980
return status;
7081
}
7182

83+
private static Target determineTarget(String[] args) {
84+
for (var arg : args) {
85+
if (arg.startsWith(TARGET_OPTION)) {
86+
return Target.valueOf(arg.substring(TARGET_OPTION.length()).toUpperCase(Locale.ROOT));
87+
}
88+
}
89+
return Target.TEST;
90+
}
91+
7292
private static Set<String> determineExcludedProjects(String[] args) {
7393
Set<String> excludedProjects = new HashSet<>();
7494
for (var arg : args) {
@@ -162,4 +182,8 @@ boolean checkLicense(Path path, List<String> expected) throws Exception {
162182
}
163183
return false;
164184
}
185+
186+
enum Target {
187+
COMPILE, TEST
188+
}
165189
}

0 commit comments

Comments
 (0)