Merge branch 'typetools:master' into rlc-collections-redesign

Author: skehrli

.azure/azure-pipelines-daily.yml

@@ -1,7 +1,8 @@
 # DO NOT EDIT azure-pipelines-daily.yml.  Edit azure-pipelines-daily.yml.m4 and defs.m4 instead.
 
 
-# define([docker_testing], [-testing])dnl
+
+
 trigger: none
 pr: none
 
@@ -19,8 +20,8 @@ variables:
 jobs:
 
 # The dependsOn clauses are:
-#  * Everything depends on the canary jobs (the main jdk24 jobs), except those jobs themselves.
-#  * Anything *_jdk11 or *_jdk17 or *_jdk21 or *_jdk25 depends on *_jdk24.
+#  * Everything depends on the canary jobs (the main jdk25 jobs), except those jobs themselves.
+#  * Any other *_jdkNN job depends on the corresponding *_jdk25 job.
 
 - job: canary_jobs
   dependsOn:
@@ -75,19 +76,6 @@ jobs:
     fetchDepth: 25
   - bash: export ORG_GRADLE_PROJECT_jdkTestVersion=21 && ./checker/bin-devel/test-cftests-junit.sh
     displayName: test-cftests-junit.sh
-- job: junit_jdk24
-  dependsOn:
-   - canary_jobs
-   - junit_jdk25
-  pool:
-    vmImage: 'ubuntu-latest'
-  container: mdernst/cf-ubuntu-jdk24:latest
-  timeoutInMinutes: 70
-  steps:
-  - checkout: self
-    fetchDepth: 25
-  - bash: export ORG_GRADLE_PROJECT_jdkTestVersion=24 && ./checker/bin-devel/test-cftests-junit.sh
-    displayName: test-cftests-junit.sh
 - job: junit_jdk25
   pool:
     vmImage: 'ubuntu-latest'
@@ -135,18 +123,6 @@ jobs:
     fetchDepth: 25
   - bash: export ORG_GRADLE_PROJECT_jdkTestVersion=21 && ./checker/bin-devel/test-cftests-nonjunit.sh
     displayName: test-cftests-nonjunit.sh
-- job: nonjunit_jdk24
-  dependsOn:
-   - canary_jobs
-   - nonjunit_jdk25
-  pool:
-    vmImage: 'ubuntu-latest'
-  container: mdernst/cf-ubuntu-jdk24:latest
-  steps:
-  - checkout: self
-    fetchDepth: 25
-  - bash: export ORG_GRADLE_PROJECT_jdkTestVersion=24 && ./checker/bin-devel/test-cftests-nonjunit.sh
-    displayName: test-cftests-nonjunit.sh
 - job: nonjunit_jdk25
   pool:
     vmImage: 'ubuntu-latest'
@@ -194,37 +170,26 @@ jobs:
     displayName: test-cftests-inference.sh
 
 # Split into part1 and part2 only for the inference job that "canary_jobs" depends on.
-- job: inference_part1_jdk24
+- job: inference_part1_jdk25
   pool:
     vmImage: 'ubuntu-latest'
-  container: mdernst/cf-ubuntu-jdk24:latest
+  container: mdernst/cf-ubuntu-jdk25:latest
   timeoutInMinutes: 90
   steps:
   - checkout: self
     fetchDepth: 25
-  - bash: export ORG_GRADLE_PROJECT_jdkTestVersion=24 && ./checker/bin-devel/test-cftests-inference-part1.sh
+  - bash: export ORG_GRADLE_PROJECT_jdkTestVersion=25 && ./checker/bin-devel/test-cftests-inference-part1.sh
     displayName: test-cftests-inference-part1.sh
-- job: inference_part2_jdk24
-  pool:
-    vmImage: 'ubuntu-latest'
-  container: mdernst/cf-ubuntu-jdk24:latest
-  timeoutInMinutes: 90
-  steps:
-  - checkout: self
-    fetchDepth: 25
-  - bash: export ORG_GRADLE_PROJECT_jdkTestVersion=24 && ./checker/bin-devel/test-cftests-inference-part2.sh
-    displayName: test-cftests-inference-part2.sh
-
-- job: inference_jdk25
+- job: inference_part2_jdk25
   pool:
     vmImage: 'ubuntu-latest'
   container: mdernst/cf-ubuntu-jdk25:latest
   timeoutInMinutes: 90
   steps:
   - checkout: self
     fetchDepth: 25
-  - bash: export ORG_GRADLE_PROJECT_jdkTestVersion=25 && ./checker/bin-devel/test-cftests-inference.sh
-    displayName: test-cftests-inference.sh
+  - bash: export ORG_GRADLE_PROJECT_jdkTestVersion=25 && ./checker/bin-devel/test-cftests-inference-part2.sh
+    displayName: test-cftests-inference-part2.sh
 
 
 # Do not run misc_job daily, because it does diffs that assume it is running in
@@ -237,7 +202,7 @@ jobs:
    - typecheck_part2_jdk25
   pool:
     vmImage: 'ubuntu-latest'
-  container: mdernst/cf-ubuntu-jdk11-plus:latest
+  container: mdernst/cf-ubuntu-jdk11:latest
   steps:
   - checkout: self
     fetchDepth: 1000
@@ -250,7 +215,7 @@ jobs:
    - typecheck_part2_jdk25
   pool:
     vmImage: 'ubuntu-latest'
-  container: mdernst/cf-ubuntu-jdk17-plus:latest
+  container: mdernst/cf-ubuntu-jdk17:latest
   steps:
   - checkout: self
     fetchDepth: 1000
@@ -263,43 +228,30 @@ jobs:
    - typecheck_part2_jdk25
   pool:
     vmImage: 'ubuntu-latest'
-  container: mdernst/cf-ubuntu-jdk21-plus:latest
+  container: mdernst/cf-ubuntu-jdk21:latest
   steps:
   - checkout: self
     fetchDepth: 1000
   - bash: export ORG_GRADLE_PROJECT_jdkTestVersion=21 && ./checker/bin-devel/test-typecheck.sh
     displayName: test-typecheck.sh
-- job: typecheck_part1_jdk24
+- job: typecheck_part1_jdk25
   pool:
     vmImage: 'ubuntu-latest'
-  container: mdernst/cf-ubuntu-jdk24-plus:latest
+  container: mdernst/cf-ubuntu-jdk25:latest
   steps:
   - checkout: self
     fetchDepth: 1000
-  - bash: export ORG_GRADLE_PROJECT_jdkTestVersion=24 && ./checker/bin-devel/test-typecheck-part1.sh
+  - bash: export ORG_GRADLE_PROJECT_jdkTestVersion=25 && ./checker/bin-devel/test-typecheck-part1.sh
     displayName: test-typecheck-part1.sh
-- job: typecheck_part2_jdk24
+- job: typecheck_part2_jdk25
   pool:
     vmImage: 'ubuntu-latest'
-  container: mdernst/cf-ubuntu-jdk24-plus:latest
+  container: mdernst/cf-ubuntu-jdk25:latest
   steps:
   - checkout: self
     fetchDepth: 1000
-  - bash: ./checker/bin-devel/test-typecheck-part2.sh
+  - bash: export ORG_GRADLE_PROJECT_jdkTestVersion=25 && ./checker/bin-devel/test-typecheck-part2.sh
     displayName: test-typecheck-part2.sh
-- job: typecheck_jdk25
-  dependsOn:
-   - canary_jobs
-   - typecheck_part1_jdk25
-   - typecheck_part2_jdk25
-  pool:
-    vmImage: 'ubuntu-latest'
-  container: mdernst/cf-ubuntu-jdk25-plus:latest
-  steps:
-  - checkout: self
-    fetchDepth: 1000
-  - bash: export ORG_GRADLE_PROJECT_jdkTestVersion=25 && ./checker/bin-devel/test-typecheck.sh
-    displayName: test-typecheck.sh
 
 - job: daikon_jdk11
   dependsOn:
@@ -315,6 +267,7 @@ jobs:
     fetchDepth: 25
   - bash: export ORG_GRADLE_PROJECT_jdkTestVersion=11 && ./checker/bin-devel/test-daikon.sh
     displayName: test-daikon.sh
+
 - job: daikon_jdk17
   dependsOn:
    - canary_jobs
@@ -329,6 +282,7 @@ jobs:
     fetchDepth: 25
   - bash: export ORG_GRADLE_PROJECT_jdkTestVersion=17 && ./checker/bin-devel/test-daikon.sh
     displayName: test-daikon.sh
+
 - job: daikon_jdk21
   dependsOn:
    - canary_jobs
@@ -343,44 +297,31 @@ jobs:
     fetchDepth: 25
   - bash: export ORG_GRADLE_PROJECT_jdkTestVersion=21 && ./checker/bin-devel/test-daikon.sh
     displayName: test-daikon.sh
-- job: daikon_part1_jdk24
+
+- job: daikon_part1_jdk25
   dependsOn:
    - canary_jobs
   pool:
     vmImage: 'ubuntu-latest'
-  container: mdernst/cf-ubuntu-jdk24:latest
+  container: mdernst/cf-ubuntu-jdk25:latest
   timeoutInMinutes: 70
   steps:
   - checkout: self
     fetchDepth: 25
-  - bash: export ORG_GRADLE_PROJECT_jdkTestVersion=24 && ./checker/bin-devel/test-daikon-part1.sh
-    displayName: test-daikon.sh
-- job: daikon_part2_jdk24
+  - bash: export ORG_GRADLE_PROJECT_jdkTestVersion=25 && ./checker/bin-devel/test-daikon-part1.sh
+    displayName: test-daikon-part1.sh
+- job: daikon_part2_jdk25
   dependsOn:
    - canary_jobs
   pool:
     vmImage: 'ubuntu-latest'
-  container: mdernst/cf-ubuntu-jdk24:latest
-  timeoutInMinutes: 80
-  steps:
-  - checkout: self
-    fetchDepth: 25
-  - bash: export ORG_GRADLE_PROJECT_jdkTestVersion=24 && ./checker/bin-devel/test-daikon.sh
-    displayName: test-daikon-part2.sh
-- job: daikon_jdk25
-  dependsOn:
-   - canary_jobs
-   - daikon_part1_jdk25
-   - daikon_part2_jdk25
-  pool:
-    vmImage: 'ubuntu-latest'
   container: mdernst/cf-ubuntu-jdk25:latest
   timeoutInMinutes: 80
   steps:
   - checkout: self
     fetchDepth: 25
-  - bash: export ORG_GRADLE_PROJECT_jdkTestVersion=25 && ./checker/bin-devel/test-daikon.sh
-    displayName: test-daikon.sh
+  - bash: export ORG_GRADLE_PROJECT_jdkTestVersion=25 && ./checker/bin-devel/test-daikon-part2.sh
+    displayName: test-daikon-part2.sh
 
 ## I think the guava_jdk11 job is failing due to Error Prone not supporting JDK 11.
 - job: guava_jdk17
@@ -409,19 +350,6 @@ jobs:
     fetchDepth: 25
   - bash: export ORG_GRADLE_PROJECT_jdkTestVersion=21 && ./checker/bin-devel/test-guava.sh
     displayName: test-guava.sh
-- job: guava_jdk24
-  dependsOn:
-   - canary_jobs
-   - guava_jdk25
-  pool:
-    vmImage: 'ubuntu-latest'
-  container: mdernst/cf-ubuntu-jdk24:latest
-  timeoutInMinutes: 70
-  steps:
-  - checkout: self
-    fetchDepth: 25
-  - bash: export ORG_GRADLE_PROJECT_jdkTestVersion=24 && ./checker/bin-devel/test-guava.sh
-    displayName: test-guava.sh
 - job: guava_jdk25
   dependsOn:
    - canary_jobs
@@ -471,18 +399,6 @@ jobs:
     fetchDepth: 25
   - bash: export ORG_GRADLE_PROJECT_jdkTestVersion=21 && ./checker/bin-devel/test-plume-lib.sh
     displayName: test-plume-lib.sh
-- job: plume_lib_jdk24
-  dependsOn:
-   - canary_jobs
-   - plume_lib_jdk25
-  pool:
-    vmImage: 'ubuntu-latest'
-  container: mdernst/cf-ubuntu-jdk24:latest
-  steps:
-  - checkout: self
-    fetchDepth: 25
-  - bash: export ORG_GRADLE_PROJECT_jdkTestVersion=24 && ./checker/bin-devel/test-plume-lib.sh
-    displayName: test-plume-lib.sh
 - job: plume_lib_jdk25
   dependsOn:
    - canary_jobs
@@ -495,52 +411,4 @@ jobs:
   - bash: export ORG_GRADLE_PROJECT_jdkTestVersion=25 && ./checker/bin-devel/test-plume-lib.sh
     displayName: test-plume-lib.sh
 
-## The downstream jobs are not currently needed because test-downstream.sh is empty.
-# - job: downstream_jdk11
-#   dependsOn:
-#    - canary_jobs
-#    - downstream_jdk21
-#   pool:
-#     vmImage: 'ubuntu-latest'
-#   container: mdernst/cf-ubuntu-jdk11:latest
-#   steps:
-#   - checkout: self
-#     fetchDepth: 25
-#   - bash: ./checker/bin-devel/test-downstream.sh
-#     displayName: test-downstream.sh
-# - job: downstream_jdk17
-#   dependsOn:
-#    - canary_jobs
-#    - downstream_jdk21
-#   pool:
-#     vmImage: 'ubuntu-latest'
-#   container: mdernst/cf-ubuntu-jdk17:latest
-#   steps:
-#   - checkout: self
-#     fetchDepth: 25
-#   - bash: ./checker/bin-devel/test-downstream.sh
-#     displayName: test-downstream.sh
-# - job: downstream_jdk21
-#   dependsOn:
-#    - canary_jobs
-#   pool:
-#     vmImage: 'ubuntu-latest'
-#   container: mdernst/cf-ubuntu-jdk21:latest
-#   steps:
-#   - checkout: self
-#     fetchDepth: 25
-#   - bash: ./checker/bin-devel/test-downstream.sh
-#     displayName: test-downstream.sh
-# - job: downstream_jdk24
-#   dependsOn:
-#    - canary_jobs
-#    - downstream_jdk21
-#   pool:
-#     vmImage: 'ubuntu-latest'
-#   container: mdernst/cf-ubuntu-jdk24:latest
-#   steps:
-#   - checkout: self
-#     fetchDepth: 25
-#   - bash: ./checker/bin-devel/test-downstream.sh
-#     displayName: test-downstream.sh