From 16aa4f5338dffe1ebf23cdb5b022e800fecb3346 Mon Sep 17 00:00:00 2001 From: Aosen Xiong Date: Sat, 10 Aug 2024 13:45:51 -0400 Subject: [PATCH 01/26] Use gradlew debug to see why dataflow fails --- checker/bin-devel/test-cftests-junit.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/checker/bin-devel/test-cftests-junit.sh b/checker/bin-devel/test-cftests-junit.sh index 92d31565b88..e3e00d0fbc3 100755 --- a/checker/bin-devel/test-cftests-junit.sh +++ b/checker/bin-devel/test-cftests-junit.sh @@ -11,4 +11,4 @@ SCRIPTDIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )" source "$SCRIPTDIR"/clone-related.sh -./gradlew test -x javadoc -x allJavadoc --console=plain --warning-mode=all +./gradlew test -x javadoc -x allJavadoc --console=plain --warning-mode=all --stacktrace From f58ec406049beb4c69e9a8f0fbe9633935fc68fc Mon Sep 17 00:00:00 2001 From: Aosen Xiong Date: Sat, 10 Aug 2024 13:52:55 -0400 Subject: [PATCH 02/26] Move delete lines to doLast block and see if it works --- dataflow/build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dataflow/build.gradle b/dataflow/build.gradle index f7dd7424c4b..aec0f01bc11 100644 --- a/dataflow/build.gradle +++ b/dataflow/build.gradle @@ -107,9 +107,9 @@ def testDataflowAnalysis(taskName, dirName, className, diff) { outputs.file("tests/${dirName}/Out.txt") outputs.file("tests/${dirName}/Test.class") - delete("tests/${dirName}/Out.txt") - delete("tests/${dirName}/Test.class") doLast { + delete("tests/${dirName}/Out.txt") + delete("tests/${dirName}/Test.class") javaexec { workingDir = "tests/${dirName}" if (!JavaVersion.current().java9Compatible) { From dbf617284f53723a6aa42e0d18e18bc1b3304a7c Mon Sep 17 00:00:00 2001 From: Aosen Xiong Date: Sat, 10 Aug 2024 14:07:18 -0400 Subject: [PATCH 03/26] Stacktrace for nonjunit test as well --- checker/bin-devel/test-cftests-nonjunit.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/checker/bin-devel/test-cftests-nonjunit.sh b/checker/bin-devel/test-cftests-nonjunit.sh index 1165c83c415..2e3fa35982b 100755 --- a/checker/bin-devel/test-cftests-nonjunit.sh +++ b/checker/bin-devel/test-cftests-nonjunit.sh @@ -11,7 +11,7 @@ SCRIPTDIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )" source "$SCRIPTDIR"/clone-related.sh -./gradlew nonJunitTests -x javadoc -x allJavadoc --console=plain --warning-mode=all +./gradlew nonJunitTests -x javadoc -x allJavadoc --console=plain --warning-mode=all --stacktrace ./gradlew publishToMavenLocal -x javadoc -x allJavadoc --console=plain --warning-mode=all # Moved example-tests out of all tests because it fails in # the release script because the newest maven artifacts are not published yet. From babd5ee2f2aec8902f5b07fef958af3c06f7f291 Mon Sep 17 00:00:00 2001 From: Aosen Xiong Date: Sat, 10 Aug 2024 14:15:01 -0400 Subject: [PATCH 04/26] Add --info --stacktrace --scan for both tests --- checker/bin-devel/test-cftests-junit.sh | 2 +- checker/bin-devel/test-cftests-nonjunit.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/checker/bin-devel/test-cftests-junit.sh b/checker/bin-devel/test-cftests-junit.sh index e3e00d0fbc3..19f94be5a44 100755 --- a/checker/bin-devel/test-cftests-junit.sh +++ b/checker/bin-devel/test-cftests-junit.sh @@ -11,4 +11,4 @@ SCRIPTDIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )" source "$SCRIPTDIR"/clone-related.sh -./gradlew test -x javadoc -x allJavadoc --console=plain --warning-mode=all --stacktrace +./gradlew test -x javadoc -x allJavadoc --console=plain --warning-mode=all --info --stacktrace --scan diff --git a/checker/bin-devel/test-cftests-nonjunit.sh b/checker/bin-devel/test-cftests-nonjunit.sh index 2e3fa35982b..9ed067b924c 100755 --- a/checker/bin-devel/test-cftests-nonjunit.sh +++ b/checker/bin-devel/test-cftests-nonjunit.sh @@ -11,7 +11,7 @@ SCRIPTDIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )" source "$SCRIPTDIR"/clone-related.sh -./gradlew nonJunitTests -x javadoc -x allJavadoc --console=plain --warning-mode=all --stacktrace +./gradlew nonJunitTests -x javadoc -x allJavadoc --console=plain --warning-mode=all --info --stacktrace --scan ./gradlew publishToMavenLocal -x javadoc -x allJavadoc --console=plain --warning-mode=all # Moved example-tests out of all tests because it fails in # the release script because the newest maven artifacts are not published yet. From 243de013adbc780fce797a13ca141c83b2de7dee Mon Sep 17 00:00:00 2001 From: Aosen Xiong Date: Sat, 10 Aug 2024 14:24:47 -0400 Subject: [PATCH 05/26] It stops failing now... --- dataflow/build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dataflow/build.gradle b/dataflow/build.gradle index aec0f01bc11..f7dd7424c4b 100644 --- a/dataflow/build.gradle +++ b/dataflow/build.gradle @@ -107,9 +107,9 @@ def testDataflowAnalysis(taskName, dirName, className, diff) { outputs.file("tests/${dirName}/Out.txt") outputs.file("tests/${dirName}/Test.class") + delete("tests/${dirName}/Out.txt") + delete("tests/${dirName}/Test.class") doLast { - delete("tests/${dirName}/Out.txt") - delete("tests/${dirName}/Test.class") javaexec { workingDir = "tests/${dirName}" if (!JavaVersion.current().java9Compatible) { From 53ba049d7d25d35ccfe049a01f7fe9dc0321dd06 Mon Sep 17 00:00:00 2001 From: Aosen Xiong Date: Sat, 10 Aug 2024 14:43:40 -0400 Subject: [PATCH 06/26] Remove the compiler options in nonjunit test and try --- checker/bin-devel/test-cftests-nonjunit.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/checker/bin-devel/test-cftests-nonjunit.sh b/checker/bin-devel/test-cftests-nonjunit.sh index 9ed067b924c..1165c83c415 100755 --- a/checker/bin-devel/test-cftests-nonjunit.sh +++ b/checker/bin-devel/test-cftests-nonjunit.sh @@ -11,7 +11,7 @@ SCRIPTDIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )" source "$SCRIPTDIR"/clone-related.sh -./gradlew nonJunitTests -x javadoc -x allJavadoc --console=plain --warning-mode=all --info --stacktrace --scan +./gradlew nonJunitTests -x javadoc -x allJavadoc --console=plain --warning-mode=all ./gradlew publishToMavenLocal -x javadoc -x allJavadoc --console=plain --warning-mode=all # Moved example-tests out of all tests because it fails in # the release script because the newest maven artifacts are not published yet. From 7b2200c4078b77c629856214eaf294efe20dc81b Mon Sep 17 00:00:00 2001 From: Aosen Xiong Date: Sat, 10 Aug 2024 16:58:31 -0400 Subject: [PATCH 07/26] Add debug options to junit-jdk21 and nonjunit --- checker/bin-devel/test-cftests-junit-jdk21.sh | 2 +- checker/bin-devel/test-cftests-nonjunit.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/checker/bin-devel/test-cftests-junit-jdk21.sh b/checker/bin-devel/test-cftests-junit-jdk21.sh index fe20e2caf60..8f13685db78 100755 --- a/checker/bin-devel/test-cftests-junit-jdk21.sh +++ b/checker/bin-devel/test-cftests-junit-jdk21.sh @@ -12,4 +12,4 @@ export ORG_GRADLE_PROJECT_useJdkCompiler=21 source "$SCRIPTDIR"/clone-related.sh -./gradlew test -x javadoc -x allJavadoc --console=plain --warning-mode=all +./gradlew test -x javadoc -x allJavadoc --console=plain --warning-mode=all --info --stacktrace --scan diff --git a/checker/bin-devel/test-cftests-nonjunit.sh b/checker/bin-devel/test-cftests-nonjunit.sh index 1165c83c415..9ed067b924c 100755 --- a/checker/bin-devel/test-cftests-nonjunit.sh +++ b/checker/bin-devel/test-cftests-nonjunit.sh @@ -11,7 +11,7 @@ SCRIPTDIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )" source "$SCRIPTDIR"/clone-related.sh -./gradlew nonJunitTests -x javadoc -x allJavadoc --console=plain --warning-mode=all +./gradlew nonJunitTests -x javadoc -x allJavadoc --console=plain --warning-mode=all --info --stacktrace --scan ./gradlew publishToMavenLocal -x javadoc -x allJavadoc --console=plain --warning-mode=all # Moved example-tests out of all tests because it fails in # the release script because the newest maven artifacts are not published yet. From 140c4eafbe5659329cd6bfea15a270a9b2798c52 Mon Sep 17 00:00:00 2001 From: Aosen Xiong Date: Sat, 10 Aug 2024 20:35:58 -0400 Subject: [PATCH 08/26] Don't do scan for junit job --- checker/bin-devel/test-cftests-junit.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/checker/bin-devel/test-cftests-junit.sh b/checker/bin-devel/test-cftests-junit.sh index 19f94be5a44..043adaf7094 100755 --- a/checker/bin-devel/test-cftests-junit.sh +++ b/checker/bin-devel/test-cftests-junit.sh @@ -11,4 +11,4 @@ SCRIPTDIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )" source "$SCRIPTDIR"/clone-related.sh -./gradlew test -x javadoc -x allJavadoc --console=plain --warning-mode=all --info --stacktrace --scan +./gradlew test -x javadoc -x allJavadoc --console=plain --warning-mode=all --info --stacktrace From cf3ce31287d426c34f704faf9dd036c55c2546dc Mon Sep 17 00:00:00 2001 From: Aosen Xiong Date: Sat, 10 Aug 2024 22:52:47 -0400 Subject: [PATCH 09/26] Add back scan for junit job --- checker/bin-devel/test-cftests-junit.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/checker/bin-devel/test-cftests-junit.sh b/checker/bin-devel/test-cftests-junit.sh index 043adaf7094..19f94be5a44 100755 --- a/checker/bin-devel/test-cftests-junit.sh +++ b/checker/bin-devel/test-cftests-junit.sh @@ -11,4 +11,4 @@ SCRIPTDIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )" source "$SCRIPTDIR"/clone-related.sh -./gradlew test -x javadoc -x allJavadoc --console=plain --warning-mode=all --info --stacktrace +./gradlew test -x javadoc -x allJavadoc --console=plain --warning-mode=all --info --stacktrace --scan From df893eb1a62e182dedd0e73ee2b24da34865bfd5 Mon Sep 17 00:00:00 2001 From: Aosen Xiong Date: Mon, 12 Aug 2024 01:16:01 -0400 Subject: [PATCH 10/26] Empty commit for CI From 61e9e65777c25cf1e97b61e31e309c32beb81159 Mon Sep 17 00:00:00 2001 From: Aosen Xiong Date: Mon, 12 Aug 2024 12:01:12 -0400 Subject: [PATCH 11/26] Empty commit for CI From a0c59ce8be4ce54a0c606c838731c0340d334e46 Mon Sep 17 00:00:00 2001 From: Aosen Xiong Date: Mon, 12 Aug 2024 15:59:39 -0400 Subject: [PATCH 12/26] Empty commit for CI From 706e599b3c65591b4d75548922298ca0f41efe0b Mon Sep 17 00:00:00 2001 From: Aosen Xiong Date: Tue, 13 Aug 2024 14:20:42 -0400 Subject: [PATCH 13/26] Empty commit for CI From 0d0aba7333a31e6bc923b06d763a65b54b7b97ea Mon Sep 17 00:00:00 2001 From: Aosen Xiong Date: Tue, 13 Aug 2024 14:52:04 -0400 Subject: [PATCH 14/26] Remove info for junit test --- checker/bin-devel/test-cftests-junit.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/checker/bin-devel/test-cftests-junit.sh b/checker/bin-devel/test-cftests-junit.sh index 19f94be5a44..41514021b74 100755 --- a/checker/bin-devel/test-cftests-junit.sh +++ b/checker/bin-devel/test-cftests-junit.sh @@ -11,4 +11,4 @@ SCRIPTDIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )" source "$SCRIPTDIR"/clone-related.sh -./gradlew test -x javadoc -x allJavadoc --console=plain --warning-mode=all --info --stacktrace --scan +./gradlew test -x javadoc -x allJavadoc --console=plain --warning-mode=all --stacktrace --scan From 470e93e004c80bcd0fa469524dc41b83371f72de Mon Sep 17 00:00:00 2001 From: Aosen Xiong Date: Tue, 13 Aug 2024 15:05:27 -0400 Subject: [PATCH 15/26] Remove scan for junit test --- checker/bin-devel/test-cftests-junit.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/checker/bin-devel/test-cftests-junit.sh b/checker/bin-devel/test-cftests-junit.sh index 41514021b74..e3e00d0fbc3 100755 --- a/checker/bin-devel/test-cftests-junit.sh +++ b/checker/bin-devel/test-cftests-junit.sh @@ -11,4 +11,4 @@ SCRIPTDIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )" source "$SCRIPTDIR"/clone-related.sh -./gradlew test -x javadoc -x allJavadoc --console=plain --warning-mode=all --stacktrace --scan +./gradlew test -x javadoc -x allJavadoc --console=plain --warning-mode=all --stacktrace From c50f1a907521fe61fb3bde19f879525384084541 Mon Sep 17 00:00:00 2001 From: Aosen Xiong Date: Tue, 13 Aug 2024 15:07:38 -0400 Subject: [PATCH 16/26] Remove stacktrace and add back scan for junit test --- checker/bin-devel/test-cftests-junit.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/checker/bin-devel/test-cftests-junit.sh b/checker/bin-devel/test-cftests-junit.sh index e3e00d0fbc3..a0ff00749cf 100755 --- a/checker/bin-devel/test-cftests-junit.sh +++ b/checker/bin-devel/test-cftests-junit.sh @@ -11,4 +11,4 @@ SCRIPTDIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )" source "$SCRIPTDIR"/clone-related.sh -./gradlew test -x javadoc -x allJavadoc --console=plain --warning-mode=all --stacktrace +./gradlew test -x javadoc -x allJavadoc --console=plain --warning-mode=all --scan From bfb0e245a5b8660b02b7260231c8079f88050d63 Mon Sep 17 00:00:00 2001 From: Aosen Xiong Date: Tue, 13 Aug 2024 15:30:25 -0400 Subject: [PATCH 17/26] Remove scan and add debug for junit test --- checker/bin-devel/test-cftests-junit.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/checker/bin-devel/test-cftests-junit.sh b/checker/bin-devel/test-cftests-junit.sh index a0ff00749cf..14553f0bb63 100755 --- a/checker/bin-devel/test-cftests-junit.sh +++ b/checker/bin-devel/test-cftests-junit.sh @@ -11,4 +11,4 @@ SCRIPTDIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )" source "$SCRIPTDIR"/clone-related.sh -./gradlew test -x javadoc -x allJavadoc --console=plain --warning-mode=all --scan +./gradlew test -x javadoc -x allJavadoc --console=plain --warning-mode=all --debug From 9e2ac2eab6ebd19716806f0984542bf059a0b1db Mon Sep 17 00:00:00 2001 From: Aosen Xiong Date: Tue, 13 Aug 2024 16:48:59 -0400 Subject: [PATCH 18/26] Try with only one worker --- checker/bin-devel/test-cftests-junit.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/checker/bin-devel/test-cftests-junit.sh b/checker/bin-devel/test-cftests-junit.sh index 14553f0bb63..bd23830b0d2 100755 --- a/checker/bin-devel/test-cftests-junit.sh +++ b/checker/bin-devel/test-cftests-junit.sh @@ -11,4 +11,4 @@ SCRIPTDIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )" source "$SCRIPTDIR"/clone-related.sh -./gradlew test -x javadoc -x allJavadoc --console=plain --warning-mode=all --debug +./gradlew test -x javadoc -x allJavadoc --console=plain --warning-mode=all --max-workers=1 --stacktrace From 867253c8aff386abf8d07de5237f2c7b14f8226a Mon Sep 17 00:00:00 2001 From: Aosen Xiong Date: Tue, 13 Aug 2024 16:56:40 -0400 Subject: [PATCH 19/26] Try with only one worker for all scripts --- checker/bin-devel/test-cftests-junit-jdk21.sh | 2 +- checker/bin-devel/test-cftests-junit.sh | 2 +- checker/bin-devel/test-cftests-nonjunit.sh | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/checker/bin-devel/test-cftests-junit-jdk21.sh b/checker/bin-devel/test-cftests-junit-jdk21.sh index 8f13685db78..3ef77bd5a06 100755 --- a/checker/bin-devel/test-cftests-junit-jdk21.sh +++ b/checker/bin-devel/test-cftests-junit-jdk21.sh @@ -12,4 +12,4 @@ export ORG_GRADLE_PROJECT_useJdkCompiler=21 source "$SCRIPTDIR"/clone-related.sh -./gradlew test -x javadoc -x allJavadoc --console=plain --warning-mode=all --info --stacktrace --scan +./gradlew test -x javadoc -x allJavadoc --console=plain --warning-mode=all --max-workers=1 diff --git a/checker/bin-devel/test-cftests-junit.sh b/checker/bin-devel/test-cftests-junit.sh index bd23830b0d2..4d07338e3d7 100755 --- a/checker/bin-devel/test-cftests-junit.sh +++ b/checker/bin-devel/test-cftests-junit.sh @@ -11,4 +11,4 @@ SCRIPTDIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )" source "$SCRIPTDIR"/clone-related.sh -./gradlew test -x javadoc -x allJavadoc --console=plain --warning-mode=all --max-workers=1 --stacktrace +./gradlew test -x javadoc -x allJavadoc --console=plain --warning-mode=all --max-workers=1 diff --git a/checker/bin-devel/test-cftests-nonjunit.sh b/checker/bin-devel/test-cftests-nonjunit.sh index 9ed067b924c..b81b08e3698 100755 --- a/checker/bin-devel/test-cftests-nonjunit.sh +++ b/checker/bin-devel/test-cftests-nonjunit.sh @@ -11,7 +11,7 @@ SCRIPTDIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )" source "$SCRIPTDIR"/clone-related.sh -./gradlew nonJunitTests -x javadoc -x allJavadoc --console=plain --warning-mode=all --info --stacktrace --scan +./gradlew nonJunitTests -x javadoc -x allJavadoc --console=plain --warning-mode=all --max-workers=1 ./gradlew publishToMavenLocal -x javadoc -x allJavadoc --console=plain --warning-mode=all # Moved example-tests out of all tests because it fails in # the release script because the newest maven artifacts are not published yet. From e1de4617a6afd8627b2814e46e54eb93286f7ed8 Mon Sep 17 00:00:00 2001 From: Aosen Xiong Date: Tue, 13 Aug 2024 18:56:38 -0400 Subject: [PATCH 20/26] Empty commit for CI From 714d271d8c9f267fa6ee9ac020be3e5734cc9f0c Mon Sep 17 00:00:00 2001 From: Aosen Xiong Date: Wed, 14 Aug 2024 16:35:21 -0400 Subject: [PATCH 21/26] Only fail when the severity is critical --- .github/workflows/dependency-review.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/dependency-review.yml b/.github/workflows/dependency-review.yml index 1c3553d96b5..e043b17308a 100644 --- a/.github/workflows/dependency-review.yml +++ b/.github/workflows/dependency-review.yml @@ -14,5 +14,6 @@ jobs: - name: 'Dependency review' uses: actions/dependency-review-action@v4 with: + fail-on-severity: critical retry-on-snapshot-warnings: true retry-on-snapshot-warnings-timeout: 600 From e3dd7be97086710960161e9ef9f62c6b38f2696a Mon Sep 17 00:00:00 2001 From: Aosen Xiong Date: Wed, 14 Aug 2024 18:55:09 -0400 Subject: [PATCH 22/26] Empty commit for CI From 035e85d87a260e6bf34de8708ff6cfc474c4ee47 Mon Sep 17 00:00:00 2001 From: Aosen Xiong Date: Wed, 14 Aug 2024 22:38:39 -0400 Subject: [PATCH 23/26] Empty commit for CI From f76acf083f9737059fc50fd14d59df39ccfe04fe Mon Sep 17 00:00:00 2001 From: Aosen Xiong <82676488+Ao-senXiong@users.noreply.github.com> Date: Fri, 16 Aug 2024 16:12:45 -0400 Subject: [PATCH 24/26] Update fail on severity to high Co-authored-by: Werner Dietl --- .github/workflows/dependency-review.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/dependency-review.yml b/.github/workflows/dependency-review.yml index e043b17308a..bbcbadef4e1 100644 --- a/.github/workflows/dependency-review.yml +++ b/.github/workflows/dependency-review.yml @@ -14,6 +14,6 @@ jobs: - name: 'Dependency review' uses: actions/dependency-review-action@v4 with: - fail-on-severity: critical + fail-on-severity: high retry-on-snapshot-warnings: true retry-on-snapshot-warnings-timeout: 600 From 592eeb870b9d9ac357d55321b350ecd8a967d179 Mon Sep 17 00:00:00 2001 From: Aosen Xiong Date: Fri, 16 Aug 2024 23:35:55 -0400 Subject: [PATCH 25/26] Update script with comment and issue link --- checker/bin-devel/test-cftests-junit-jdk21.sh | 3 ++- checker/bin-devel/test-cftests-junit.sh | 3 ++- checker/bin-devel/test-cftests-nonjunit.sh | 3 ++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/checker/bin-devel/test-cftests-junit-jdk21.sh b/checker/bin-devel/test-cftests-junit-jdk21.sh index 3ef77bd5a06..96e74aac9a5 100755 --- a/checker/bin-devel/test-cftests-junit-jdk21.sh +++ b/checker/bin-devel/test-cftests-junit-jdk21.sh @@ -11,5 +11,6 @@ SCRIPTDIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )" export ORG_GRADLE_PROJECT_useJdkCompiler=21 source "$SCRIPTDIR"/clone-related.sh - +# Adding --max-workers=1 to avoid random failures in Github Actions. alternative solution is to use --no-build-cache. +# https://github.com/eisop/checker-framework/issues/849 ./gradlew test -x javadoc -x allJavadoc --console=plain --warning-mode=all --max-workers=1 diff --git a/checker/bin-devel/test-cftests-junit.sh b/checker/bin-devel/test-cftests-junit.sh index 4d07338e3d7..4bd3435ed68 100755 --- a/checker/bin-devel/test-cftests-junit.sh +++ b/checker/bin-devel/test-cftests-junit.sh @@ -10,5 +10,6 @@ SCRIPTDIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )" # shellcheck disable=SC1090# In newer shellcheck than 0.6.0, pass: "-P SCRIPTDIR" (literally) source "$SCRIPTDIR"/clone-related.sh - +# Adding --max-workers=1 to avoid random failures in Github Actions. alternative solution is to use --no-build-cache. +# https://github.com/eisop/checker-framework/issues/849 ./gradlew test -x javadoc -x allJavadoc --console=plain --warning-mode=all --max-workers=1 diff --git a/checker/bin-devel/test-cftests-nonjunit.sh b/checker/bin-devel/test-cftests-nonjunit.sh index b81b08e3698..5a571e9e3a6 100755 --- a/checker/bin-devel/test-cftests-nonjunit.sh +++ b/checker/bin-devel/test-cftests-nonjunit.sh @@ -10,7 +10,8 @@ SCRIPTDIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )" # shellcheck disable=SC1090# In newer shellcheck than 0.6.0, pass: "-P SCRIPTDIR" (literally) source "$SCRIPTDIR"/clone-related.sh - +# Adding --max-workers=1 to avoid random failures in Github Actions. alternative solution is to use --no-build-cache. +# https://github.com/eisop/checker-framework/issues/849 ./gradlew nonJunitTests -x javadoc -x allJavadoc --console=plain --warning-mode=all --max-workers=1 ./gradlew publishToMavenLocal -x javadoc -x allJavadoc --console=plain --warning-mode=all # Moved example-tests out of all tests because it fails in From 9c4c12adcf13eb7cc1fa62f0f56f6d6e866c432f Mon Sep 17 00:00:00 2001 From: Werner Dietl Date: Sat, 17 Aug 2024 20:05:54 -0400 Subject: [PATCH 26/26] Apply suggestions from code review --- checker/bin-devel/test-cftests-junit-jdk21.sh | 2 +- checker/bin-devel/test-cftests-junit.sh | 2 +- checker/bin-devel/test-cftests-nonjunit.sh | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/checker/bin-devel/test-cftests-junit-jdk21.sh b/checker/bin-devel/test-cftests-junit-jdk21.sh index 96e74aac9a5..c3785231301 100755 --- a/checker/bin-devel/test-cftests-junit-jdk21.sh +++ b/checker/bin-devel/test-cftests-junit-jdk21.sh @@ -11,6 +11,6 @@ SCRIPTDIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )" export ORG_GRADLE_PROJECT_useJdkCompiler=21 source "$SCRIPTDIR"/clone-related.sh -# Adding --max-workers=1 to avoid random failures in Github Actions. alternative solution is to use --no-build-cache. +# Adding --max-workers=1 to avoid random failures in Github Actions. An alternative solution is to use --no-build-cache. # https://github.com/eisop/checker-framework/issues/849 ./gradlew test -x javadoc -x allJavadoc --console=plain --warning-mode=all --max-workers=1 diff --git a/checker/bin-devel/test-cftests-junit.sh b/checker/bin-devel/test-cftests-junit.sh index 4bd3435ed68..eaf78761af0 100755 --- a/checker/bin-devel/test-cftests-junit.sh +++ b/checker/bin-devel/test-cftests-junit.sh @@ -10,6 +10,6 @@ SCRIPTDIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )" # shellcheck disable=SC1090# In newer shellcheck than 0.6.0, pass: "-P SCRIPTDIR" (literally) source "$SCRIPTDIR"/clone-related.sh -# Adding --max-workers=1 to avoid random failures in Github Actions. alternative solution is to use --no-build-cache. +# Adding --max-workers=1 to avoid random failures in Github Actions. An alternative solution is to use --no-build-cache. # https://github.com/eisop/checker-framework/issues/849 ./gradlew test -x javadoc -x allJavadoc --console=plain --warning-mode=all --max-workers=1 diff --git a/checker/bin-devel/test-cftests-nonjunit.sh b/checker/bin-devel/test-cftests-nonjunit.sh index 5a571e9e3a6..55667f55a0c 100755 --- a/checker/bin-devel/test-cftests-nonjunit.sh +++ b/checker/bin-devel/test-cftests-nonjunit.sh @@ -10,7 +10,7 @@ SCRIPTDIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )" # shellcheck disable=SC1090# In newer shellcheck than 0.6.0, pass: "-P SCRIPTDIR" (literally) source "$SCRIPTDIR"/clone-related.sh -# Adding --max-workers=1 to avoid random failures in Github Actions. alternative solution is to use --no-build-cache. +# Adding --max-workers=1 to avoid random failures in Github Actions. An alternative solution is to use --no-build-cache. # https://github.com/eisop/checker-framework/issues/849 ./gradlew nonJunitTests -x javadoc -x allJavadoc --console=plain --warning-mode=all --max-workers=1 ./gradlew publishToMavenLocal -x javadoc -x allJavadoc --console=plain --warning-mode=all