Merge branch 'master' into jspecify-eisop

.github/workflows/dependency-review.yml

@@ -14,5 +14,6 @@ jobs:
       - name: 'Dependency review'
         uses: actions/dependency-review-action@v4
         with:
+          fail-on-severity: high
           retry-on-snapshot-warnings: true
           retry-on-snapshot-warnings-timeout: 600

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
 
-
-./gradlew test -x javadoc -x allJavadoc --console=plain --warning-mode=all
+# 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

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
 
-
-./gradlew test -x javadoc -x allJavadoc --console=plain --warning-mode=all
+# 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

checker/bin-devel/test-cftests-nonjunit.sh

@@ -10,8 +10,9 @@ 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
 
-
-./gradlew nonJunitTests -x javadoc -x allJavadoc --console=plain --warning-mode=all
+# 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
 # Moved example-tests out of all tests because it fails in
 # the release script because the newest maven artifacts are not published yet.

checker/bin-devel/test-jspecify-reference-checker.sh

@@ -14,13 +14,13 @@ source "$SCRIPTDIR"/clone-related.sh
 
 GIT_SCRIPTS="$SCRIPTDIR/.git-scripts"
 # TODO: remove uses of `main-eisop` once that becomes `main`.
-"$GIT_SCRIPTS/git-clone-related" jspecify jspecify-reference-checker -b main-eisop
+"$GIT_SCRIPTS/git-clone-related" --upstream-branch main-eisop jspecify jspecify-reference-checker
+
+cd ../jspecify-reference-checker
 
 # Delete the eisop/jdk that was already cloned...
 rm -r ../jdk
 # instead clone the jspecify/jdk.
 "$GIT_SCRIPTS/git-clone-related" jspecify jdk
 
-cd ../jspecify-reference-checker
-git switch main-eisop
-./gradlew build conformanceTests demoTest --console=plain --include-build "$CHECKERFRAMEWORK"
+JSPECIFY_CONFORMANCE_TEST_MODE=details ./gradlew build conformanceTests demoTest --console=plain --include-build "$CHECKERFRAMEWORK"

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.10-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME