Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
44 commits
Select commit Hold shift + click to select a range
454c722
Test under Java 26
mernst Mar 29, 2026
cbe0a1c
Remove empty comment
mernst Mar 29, 2026
a89abce
Reinstate setting `JAVA24`
mernst Mar 29, 2026
8f1090d
Handle Java 26
mernst Mar 30, 2026
b914a5d
Run make
mernst Mar 30, 2026
cc5a651
Set JAVA25_HOME only if exactly Java 25
mernst Mar 30, 2026
7cca4d5
Update Checker Framework to 3.55.1
markro49 Apr 23, 2026
2fbcede
Merge branch 'master' of github.com:codespecs/daikon
mernst Apr 27, 2026
1dd6611
Merge branch 'master' of github.com:codespecs/daikon
mernst Apr 29, 2026
0078ef5
Merge branch 'master' of github.com:codespecs/daikon
mernst May 1, 2026
179bf7f
Merge branch 'master' of github.com:codespecs/daikon
mernst May 4, 2026
e41df51
Merge branch 'master' of github.com:codespecs/daikon
mernst May 7, 2026
7b1d4b7
Merge branch 'master' of github.com:codespecs/daikon
mernst May 8, 2026
b3dc424
Merge branch 'master' of github.com:codespecs/daikon
mernst May 9, 2026
ad6a9dd
Merge branch 'master' of github.com:codespecs/daikon
mernst May 11, 2026
bb6fb9b
Merge branch 'master' of github.com:codespecs/daikon
mernst May 12, 2026
19cbabd
Merge ../daikon-branch-master into java26
mernst Jun 4, 2026
dc59579
Set `JAVA_HOME` before `JAVANN_HOME`
mernst Jun 4, 2026
1b8ea9c
Fix scoping
mernst Jun 4, 2026
7e3e457
Fix setting `JAVA_HOME`
mernst Jun 4, 2026
22afd73
Merge ../daikon-branch-master into update-cf
mernst Jun 4, 2026
169bd5e
Merge ../daikon-fork-mernst-branch-update-cf into java26
mernst Jun 4, 2026
0299a8b
Merge branch 'master' into java26
mernst Jun 5, 2026
2febbd7
Merge ../daikon-branch-master into java26
mernst Jun 5, 2026
69c97d0
copy some .comp goal files for Ubuntu-26.04
markro49 Jun 5, 2026
e168a84
Fixes
mernst Jun 5, 2026
7993305
Merge ../daikon-branch-master into ubuntu-2604
mernst Jun 6, 2026
7450fe0
Don't run gradle under Java 11
mernst Jun 6, 2026
abbb1c7
Merge ../daikon-branch-ubuntu-2604 into java26
mernst Jun 6, 2026
580d135
Merge ../daikon-branch-master into java26
mernst Jul 5, 2026
b328607
Improve installation of gradle
mernst Jul 5, 2026
0680d0c
Complete the edit
mernst Jul 5, 2026
1618847
Merge ../daikon-branch-master into java26
mernst Jul 8, 2026
be07e0e
Merge branch 'master' into java26
mernst Jul 10, 2026
27c4d92
Avoid use of `Process`
mernst Jul 11, 2026
fccd3f0
Use `@InheritableMustCall`
mernst Jul 11, 2026
e527936
Reinstate `close()`
mernst Jul 11, 2026
6301d24
Make `Chicory` implement `AutoCloseable`
mernst Jul 11, 2026
42acd6e
Add lock annotation
mernst Jul 11, 2026
241c407
Code review
mernst Jul 11, 2026
3d52d20
Suppress warnings
mernst Jul 11, 2026
da5f541
Suppress warnings
mernst Jul 11, 2026
e93a402
Merge ../daikon-branch-master into java26
mernst Jul 11, 2026
2eb89ea
Abstract out `deleteQuietly()`
mernst Jul 11, 2026
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
233 changes: 232 additions & 1 deletion .azure/azure-pipelines.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:

# The dependsOn clauses (in this file and in .circleci/config.yml) are:
# * Everything not *_ubuntu_jdk25 or typecheck_*_jdk25 depends on canary_jobs.
# * Anything *_jdk8 or *_jdk11 or *_jdk17 or *_jdk21 depends on *_jdk25.
# * Anything *_jdk8 or *_jdk11 or *_jdk17 or *_jdk21 or *_jdk26 depends on *_jdk25.
# * Anything *_rockylinux_* depends on *_ubuntu_*.
# The remainder of jobs are run only if the canary_jobs pass.
- job: canary_jobs
Expand Down Expand Up @@ -83,6 +83,18 @@ jobs:
fetchDepth: 25
- bash: ./scripts/test-quick-txt-diff.sh
displayName: test-quick-txt-diff.sh
- job: quick_ubuntu_jdk26
dependsOn:
- canary_jobs
- quick_ubuntu_jdk25
pool:
vmImage: 'ubuntu-latest'
container: mdernst/daikon-ubuntu-jdk26${{ variables.testingSuffix }}:latest
steps:
- checkout: self
fetchDepth: 25
- bash: ./scripts/test-quick-txt-diff.sh
displayName: test-quick-txt-diff.sh

- job: nonquick_ubuntu_jdk11
dependsOn:
Expand Down Expand Up @@ -129,6 +141,18 @@ jobs:
fetchDepth: 25
- bash: ./scripts/test-nonquick-txt-diff.sh
displayName: test-nonquick-txt-diff.sh
- job: nonquick_ubuntu_jdk26
dependsOn:
- canary_jobs
- nonquick_ubuntu_jdk25
pool:
vmImage: 'ubuntu-latest'
container: mdernst/daikon-ubuntu-jdk26${{ variables.testingSuffix }}:latest
steps:
- checkout: self
fetchDepth: 25
- bash: ./scripts/test-nonquick-txt-diff.sh
displayName: test-nonquick-txt-diff.sh

- job: nontxt_ubuntu_jdk11
dependsOn:
Expand Down Expand Up @@ -175,6 +199,18 @@ jobs:
fetchDepth: 25
- bash: ./scripts/test-non-txt-diff.sh
displayName: test-non-txt-diff.sh
- job: nontxt_ubuntu_jdk26
dependsOn:
- canary_jobs
- nontxt_ubuntu_jdk25
pool:
vmImage: 'ubuntu-latest'
container: mdernst/daikon-ubuntu-jdk26${{ variables.testingSuffix }}:latest
steps:
- checkout: self
fetchDepth: 25
- bash: ./scripts/test-non-txt-diff.sh
displayName: test-non-txt-diff.sh

- job: misc_ubuntu_jdk11
dependsOn:
Expand Down Expand Up @@ -229,6 +265,20 @@ jobs:
displayName: make showvars
- bash: ./scripts/test-misc.sh
displayName: test-misc.sh
- job: misc_ubuntu_jdk26
dependsOn:
- canary_jobs
- misc_ubuntu_jdk25
pool:
vmImage: 'ubuntu-latest'
container: mdernst/daikon-ubuntu-jdk26-plus${{ variables.testingSuffix }}:latest
steps:
- checkout: self
fetchDepth: 25
- bash: make showvars
displayName: make showvars
- bash: ./scripts/test-misc.sh
displayName: test-misc.sh

- job: kvasir_ubuntu_jdk11
dependsOn:
Expand All @@ -251,6 +301,18 @@ jobs:
fetchDepth: 25
- bash: ./scripts/test-kvasir.sh
displayName: test-kvasir.sh
- job: kvasir_ubuntu_jdk26
dependsOn:
- canary_jobs
- kvasir_ubuntu_jdk25
pool:
vmImage: 'ubuntu-latest'
container: mdernst/daikon-ubuntu-jdk26-plus${{ variables.testingSuffix }}:latest
steps:
- checkout: self
fetchDepth: 25
- bash: ./scripts/test-kvasir.sh
displayName: test-kvasir.sh

## The Checker Framework cannot be run under Java 8 or 11.
## Thus, there is no typecheck_bundled_ubuntu_jdk{8,11} job.
Expand Down Expand Up @@ -493,6 +555,108 @@ jobs:
displayName: show Java version
- bash: ./scripts/test-typecheck-with-latest-cf.sh part3
displayName: test-typecheck-with-latest-cf.sh part3
- job: typecheck_bundled_part1_ubuntu_jdk26
dependsOn:
- canary_jobs
- typecheck_bundled_part1_ubuntu_jdk25
pool:
vmImage: 'ubuntu-latest'
container: mdernst/daikon-ubuntu-jdk26-plus${{ variables.testingSuffix }}:latest
timeoutInMinutes: 40
steps:
- checkout: self
fetchDepth: 25
- bash: |
java -version
javac -version
displayName: show Java version
- bash: ./scripts/test-typecheck-with-bundled-cf.sh part1
displayName: test-typecheck-with-bundled-cf.sh part1
- job: typecheck_bundled_part2_ubuntu_jdk26
dependsOn:
- canary_jobs
- typecheck_bundled_part2_ubuntu_jdk25
pool:
vmImage: 'ubuntu-latest'
container: mdernst/daikon-ubuntu-jdk26-plus${{ variables.testingSuffix }}:latest
timeoutInMinutes: 40
steps:
- checkout: self
fetchDepth: 25
- bash: |
java -version
javac -version
displayName: show Java version
- bash: ./scripts/test-typecheck-with-bundled-cf.sh part2
displayName: test-typecheck-with-bundled-cf.sh part2
- job: typecheck_bundled_part3_ubuntu_jdk26
dependsOn:
- canary_jobs
- typecheck_bundled_part3_ubuntu_jdk25
pool:
vmImage: 'ubuntu-latest'
container: mdernst/daikon-ubuntu-jdk26-plus${{ variables.testingSuffix }}:latest
timeoutInMinutes: 40
steps:
- checkout: self
fetchDepth: 25
- bash: |
java -version
javac -version
displayName: show Java version
- bash: ./scripts/test-typecheck-with-bundled-cf.sh part3
displayName: test-typecheck-with-bundled-cf.sh part3
- job: typecheck_latest_part1_ubuntu_jdk26
dependsOn:
- canary_jobs
- typecheck_latest_part1_ubuntu_jdk25
pool:
vmImage: 'ubuntu-latest'
container: mdernst/daikon-ubuntu-jdk26-plus${{ variables.testingSuffix }}:latest
timeoutInMinutes: 40
steps:
- checkout: self
fetchDepth: 25
- bash: |
java -version
javac -version
displayName: show Java version
- bash: ./scripts/test-typecheck-with-latest-cf.sh part1
displayName: test-typecheck-with-latest-cf.sh part1
- job: typecheck_latest_part2_ubuntu_jdk26
dependsOn:
- canary_jobs
- typecheck_latest_part2_ubuntu_jdk25
pool:
vmImage: 'ubuntu-latest'
container: mdernst/daikon-ubuntu-jdk26-plus${{ variables.testingSuffix }}:latest
timeoutInMinutes: 40
steps:
- checkout: self
fetchDepth: 25
- bash: |
java -version
javac -version
displayName: show Java version
- bash: ./scripts/test-typecheck-with-latest-cf.sh part2
displayName: test-typecheck-with-latest-cf.sh part2
- job: typecheck_latest_part3_ubuntu_jdk26
dependsOn:
- canary_jobs
- typecheck_latest_part3_ubuntu_jdk25
pool:
vmImage: 'ubuntu-latest'
container: mdernst/daikon-ubuntu-jdk26-plus${{ variables.testingSuffix }}:latest
timeoutInMinutes: 40
steps:
- checkout: self
fetchDepth: 25
- bash: |
java -version
javac -version
displayName: show Java version
- bash: ./scripts/test-typecheck-with-latest-cf.sh part3
displayName: test-typecheck-with-latest-cf.sh part3

- job: quick_rockylinux_jdk11
dependsOn:
Expand All @@ -519,6 +683,19 @@ jobs:
fetchDepth: 25
- bash: ./scripts/test-quick-txt-diff.sh
displayName: test-quick-txt-diff.sh
- job: quick_rockylinux_jdk26
dependsOn:
- canary_jobs
- quick_rockylinux_jdk25
- quick_ubuntu_jdk26
pool:
vmImage: 'ubuntu-latest'
container: mdernst/daikon-rockylinux-jdk26${{ variables.testingSuffix }}:latest
steps:
- checkout: self
fetchDepth: 25
- bash: ./scripts/test-quick-txt-diff.sh
displayName: test-quick-txt-diff.sh

- job: nonquick_rockylinux_jdk11
dependsOn:
Expand All @@ -545,6 +722,19 @@ jobs:
fetchDepth: 25
- bash: ./scripts/test-nonquick-txt-diff.sh
displayName: test-nonquick-txt-diff.sh
- job: nonquick_rockylinux_jdk26
dependsOn:
- canary_jobs
- nonquick_rockylinux_jdk25
- nonquick_ubuntu_jdk26
pool:
vmImage: 'ubuntu-latest'
container: mdernst/daikon-rockylinux-jdk26${{ variables.testingSuffix }}:latest
steps:
- checkout: self
fetchDepth: 25
- bash: ./scripts/test-nonquick-txt-diff.sh
displayName: test-nonquick-txt-diff.sh

- job: nontxt_rockylinux_jdk11
dependsOn:
Expand All @@ -571,6 +761,19 @@ jobs:
fetchDepth: 25
- bash: ./scripts/test-non-txt-diff.sh
displayName: test-non-txt-diff.sh
- job: nontxt_rockylinux_jdk26
dependsOn:
- canary_jobs
- nontxt_rockylinux_jdk25
- nontxt_ubuntu_jdk26
pool:
vmImage: 'ubuntu-latest'
container: mdernst/daikon-rockylinux-jdk26${{ variables.testingSuffix }}:latest
steps:
- checkout: self
fetchDepth: 25
- bash: ./scripts/test-non-txt-diff.sh
displayName: test-non-txt-diff.sh

- job: misc_rockylinux_jdk11
dependsOn:
Expand Down Expand Up @@ -601,6 +804,21 @@ jobs:
displayName: make showvars
- bash: ./scripts/test-misc.sh
displayName: test-misc.sh
- job: misc_rockylinux_jdk26
dependsOn:
- canary_jobs
- misc_rockylinux_jdk25
- misc_ubuntu_jdk26
pool:
vmImage: 'ubuntu-latest'
container: mdernst/daikon-rockylinux-jdk26-plus${{ variables.testingSuffix }}:latest
steps:
- checkout: self
fetchDepth: 25
- bash: make showvars
displayName: make showvars
- bash: ./scripts/test-misc.sh
displayName: test-misc.sh

- job: kvasir_rockylinux_jdk11
dependsOn:
Expand All @@ -627,6 +845,19 @@ jobs:
fetchDepth: 25
- bash: ./scripts/test-kvasir.sh
displayName: test-kvasir.sh
- job: kvasir_rockylinux_jdk26
dependsOn:
- canary_jobs
- kvasir_rockylinux_jdk25
- kvasir_ubuntu_jdk26
pool:
vmImage: 'ubuntu-latest'
container: mdernst/daikon-rockylinux-jdk26-plus${{ variables.testingSuffix }}:latest
steps:
- checkout: self
fetchDepth: 25
- bash: ./scripts/test-kvasir.sh
displayName: test-kvasir.sh

# ## Enable this job to prioritize typechecking a single file, without waiting for other tests.
# - job: typecheck_onefile_jdk21
Expand Down
2 changes: 1 addition & 1 deletion .azure/azure-pipelines.yml.m4
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:

# The dependsOn clauses (in this file and in .circleci/config.yml) are:
# * Everything not *_ubuntu_jdk[]canary_version or typecheck_*_jdk[]canary_version depends on canary_jobs.
# * Anything *_jdk8 or *_jdk11 or *_jdk17 or *_jdk21 depends on *_jdk25.
# * Anything *_jdk8 or *_jdk11 or *_jdk17 or *_jdk21 or *_jdk26 depends on *_jdk25.
# * Anything *_rockylinux_* depends on *_ubuntu_*.
# The remainder of jobs are run only if the canary_jobs pass.
- job: canary_jobs
Expand Down
12 changes: 12 additions & 0 deletions .azure/jobs.m4
Original file line number Diff line number Diff line change
Expand Up @@ -2,24 +2,29 @@ quick_job(ubuntu, 11)
quick_job(ubuntu, 17)
quick_job(ubuntu, 21)
quick_job(ubuntu, 25)
quick_job(ubuntu, 26)

nonquick_job(ubuntu, 11)
nonquick_job(ubuntu, 17)
nonquick_job(ubuntu, 21)
nonquick_job(ubuntu, 25)
nonquick_job(ubuntu, 26)

nontxt_job(ubuntu, 11)
nontxt_job(ubuntu, 17)
nontxt_job(ubuntu, 21)
nontxt_job(ubuntu, 25)
nontxt_job(ubuntu, 26)

misc_job(ubuntu, 11)
misc_job(ubuntu, 17)
misc_job(ubuntu, 21)
misc_job(ubuntu, 25)
misc_job(ubuntu, 26)

kvasir_job(ubuntu, 11)
kvasir_job(ubuntu, 25)
kvasir_job(ubuntu, 26)

## The Checker Framework cannot be run under Java 8 or 11.
## Thus, there is no typecheck_bundled_ubuntu_jdk{8,11} job.
Expand All @@ -30,18 +35,25 @@ typecheck_job_parts(ubuntu, 21, bundled)
typecheck_job_parts(ubuntu, 21, latest)
typecheck_job_parts(ubuntu, 25, bundled)
typecheck_job_parts(ubuntu, 25, latest)
typecheck_job_parts(ubuntu, 26, bundled)
typecheck_job_parts(ubuntu, 26, latest)

quick_job(rockylinux, 11)
quick_job(rockylinux, 25)
quick_job(rockylinux, 26)

nonquick_job(rockylinux, 11)
nonquick_job(rockylinux, 25)
nonquick_job(rockylinux, 26)

nontxt_job(rockylinux, 11)
nontxt_job(rockylinux, 25)
nontxt_job(rockylinux, 26)

misc_job(rockylinux, 11)
misc_job(rockylinux, 25)
misc_job(rockylinux, 26)

kvasir_job(rockylinux, 11)
kvasir_job(rockylinux, 25)
kvasir_job(rockylinux, 26)
4 changes: 2 additions & 2 deletions .circleci/Makefile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
PLUME_SCRIPTS ?= ../.utils/plume-scripts
ifeq (,$(wildcard ${PLUME_SCRIPTS}))
mkdir -p $(dirname ${PLUME_SCRIPTS})
dummy := $(shell git clone --depth=1 -q https://github.com/plume-lib/plume-scripts.git ${PLUME_SCRIPTS})
dummy1 := $(shell mkdir -p $(dirname ${PLUME_SCRIPTS}))
dummy2 := $(shell git clone --depth=1 -q https://github.com/plume-lib/plume-scripts.git ${PLUME_SCRIPTS})
endif

.PHONY: all default clean
Expand Down
Loading