Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update Dockerfiles #569

Open
wants to merge 18 commits into
base: master
Choose a base branch
from
Open

Update Dockerfiles #569

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
6fc2c6f
Update Dockerfiles
mernst Nov 16, 2024
c959e2b
update goal files for Ubuntu-24.10
markro49 Nov 16, 2024
3e23ee5
Actually use 24.10
mernst Nov 16, 2024
6350578
Merge ../daikon-fork-markro49-branch-ubuntu-2410 into docker-ubuntu-2…
mernst Nov 17, 2024
648b1d9
Set Java version explicitly
mernst Nov 22, 2024
c0ba7de
Bundlle Checker Framework 3.48.2
mernst Nov 22, 2024
f9e4cf3
Use LABEL instead of MAINTAINER in dockerfiles
mernst Nov 23, 2024
a83b9c2
Test Java 23 instead of Java 24
mernst Nov 23, 2024
c904881
Merge branch 'docker-ubuntu-24-10' of github.com:mernst/daikon into d…
mernst Nov 23, 2024
5a24caf
java 23 needs same changes as java 24
markro49 Nov 23, 2024
8ad5a8c
Merge ../daikon-fork-markro49-branch-ubuntu-2410 into docker-ubuntu-2…
mernst Nov 24, 2024
1f7fb8c
Merge ../daikon-branch-master into docker-ubuntu-24-10
mernst Nov 26, 2024
c54bab4
Merge branch 'docker-ubuntu-24-10' of github.com:mernst/daikon into d…
mernst Nov 26, 2024
3e461fe
Set locale
mernst Dec 14, 2024
6f2d161
More diagnostics
mernst Dec 19, 2024
3791708
Java 23, not Java 24 yet
mernst Dec 19, 2024
3b21c85
Java 23, not Java 24 yet
mernst Dec 19, 2024
125cf4f
Skip "junit" test under Java 23
mernst Dec 19, 2024
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
50 changes: 25 additions & 25 deletions .circleci/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:

quick-txt-diff-ubuntu-jdk8:
docker:
- image: mdernst/daikon-ubuntu-jdk8
- image: mdernst/daikon-ubuntu-jdk8-testing
resource_class: large
environment:
CIRCLE_COMPARE_URL: << pipeline.project.git_url >>/compare/<< pipeline.git.base_revision >>..<<pipeline.git.revision>>
Expand All @@ -35,7 +35,7 @@ jobs:

quick-txt-diff-ubuntu-jdk11:
docker:
- image: mdernst/daikon-ubuntu-jdk11
- image: mdernst/daikon-ubuntu-jdk11-testing
resource_class: large
environment:
CIRCLE_COMPARE_URL: << pipeline.project.git_url >>/compare/<< pipeline.git.base_revision >>..<<pipeline.git.revision>>
Expand All @@ -54,7 +54,7 @@ jobs:

quick-txt-diff-ubuntu-jdk17:
docker:
- image: mdernst/daikon-ubuntu-jdk17
- image: mdernst/daikon-ubuntu-jdk17-testing
resource_class: large
environment:
CIRCLE_COMPARE_URL: << pipeline.project.git_url >>/compare/<< pipeline.git.base_revision >>..<<pipeline.git.revision>>
Expand All @@ -73,7 +73,7 @@ jobs:

quick-txt-diff-ubuntu-jdk21:
docker:
- image: mdernst/daikon-ubuntu-jdk21
- image: mdernst/daikon-ubuntu-jdk21-testing
resource_class: large
environment:
CIRCLE_COMPARE_URL: << pipeline.project.git_url >>/compare/<< pipeline.git.base_revision >>..<<pipeline.git.revision>>
Expand All @@ -92,7 +92,7 @@ jobs:

nonquick-txt-diff-ubuntu-jdk8:
docker:
- image: mdernst/daikon-ubuntu-jdk8
- image: mdernst/daikon-ubuntu-jdk8-testing
resource_class: large
environment:
CIRCLE_COMPARE_URL: << pipeline.project.git_url >>/compare/<< pipeline.git.base_revision >>..<<pipeline.git.revision>>
Expand All @@ -111,7 +111,7 @@ jobs:

nonquick-txt-diff-ubuntu-jdk11:
docker:
- image: mdernst/daikon-ubuntu-jdk11
- image: mdernst/daikon-ubuntu-jdk11-testing
resource_class: large
environment:
CIRCLE_COMPARE_URL: << pipeline.project.git_url >>/compare/<< pipeline.git.base_revision >>..<<pipeline.git.revision>>
Expand All @@ -130,7 +130,7 @@ jobs:

nonquick-txt-diff-ubuntu-jdk17:
docker:
- image: mdernst/daikon-ubuntu-jdk17
- image: mdernst/daikon-ubuntu-jdk17-testing
resource_class: large
environment:
CIRCLE_COMPARE_URL: << pipeline.project.git_url >>/compare/<< pipeline.git.base_revision >>..<<pipeline.git.revision>>
Expand All @@ -149,7 +149,7 @@ jobs:

nonquick-txt-diff-ubuntu-jdk21:
docker:
- image: mdernst/daikon-ubuntu-jdk21
- image: mdernst/daikon-ubuntu-jdk21-testing
resource_class: large
environment:
CIRCLE_COMPARE_URL: << pipeline.project.git_url >>/compare/<< pipeline.git.base_revision >>..<<pipeline.git.revision>>
Expand All @@ -168,7 +168,7 @@ jobs:

non-txt-diff-ubuntu-jdk8:
docker:
- image: mdernst/daikon-ubuntu-jdk8
- image: mdernst/daikon-ubuntu-jdk8-testing
resource_class: large
environment:
CIRCLE_COMPARE_URL: << pipeline.project.git_url >>/compare/<< pipeline.git.base_revision >>..<<pipeline.git.revision>>
Expand All @@ -187,7 +187,7 @@ jobs:

non-txt-diff-ubuntu-jdk11:
docker:
- image: mdernst/daikon-ubuntu-jdk11
- image: mdernst/daikon-ubuntu-jdk11-testing
resource_class: large
environment:
CIRCLE_COMPARE_URL: << pipeline.project.git_url >>/compare/<< pipeline.git.base_revision >>..<<pipeline.git.revision>>
Expand All @@ -206,7 +206,7 @@ jobs:

non-txt-diff-ubuntu-jdk17:
docker:
- image: mdernst/daikon-ubuntu-jdk17
- image: mdernst/daikon-ubuntu-jdk17-testing
resource_class: large
environment:
CIRCLE_COMPARE_URL: << pipeline.project.git_url >>/compare/<< pipeline.git.base_revision >>..<<pipeline.git.revision>>
Expand All @@ -225,7 +225,7 @@ jobs:

non-txt-diff-ubuntu-jdk21:
docker:
- image: mdernst/daikon-ubuntu-jdk21
- image: mdernst/daikon-ubuntu-jdk21-testing
resource_class: large
environment:
CIRCLE_COMPARE_URL: << pipeline.project.git_url >>/compare/<< pipeline.git.base_revision >>..<<pipeline.git.revision>>
Expand All @@ -244,7 +244,7 @@ jobs:

misc-ubuntu-jdk8:
docker:
- image: mdernst/daikon-ubuntu-jdk8-plus
- image: mdernst/daikon-ubuntu-jdk8-plus-testing
resource_class: large
environment:
CIRCLE_COMPARE_URL: << pipeline.project.git_url >>/compare/<< pipeline.git.base_revision >>..<<pipeline.git.revision>>
Expand All @@ -263,7 +263,7 @@ jobs:

misc-ubuntu-jdk11:
docker:
- image: mdernst/daikon-ubuntu-jdk11-plus
- image: mdernst/daikon-ubuntu-jdk11-plus-testing
resource_class: large
environment:
CIRCLE_COMPARE_URL: << pipeline.project.git_url >>/compare/<< pipeline.git.base_revision >>..<<pipeline.git.revision>>
Expand All @@ -282,7 +282,7 @@ jobs:

misc-ubuntu-jdk17:
docker:
- image: mdernst/daikon-ubuntu-jdk17-plus
- image: mdernst/daikon-ubuntu-jdk17-plus-testing
resource_class: large
environment:
CIRCLE_COMPARE_URL: << pipeline.project.git_url >>/compare/<< pipeline.git.base_revision >>..<<pipeline.git.revision>>
Expand All @@ -301,7 +301,7 @@ jobs:

misc-ubuntu-jdk21:
docker:
- image: mdernst/daikon-ubuntu-jdk21-plus
- image: mdernst/daikon-ubuntu-jdk21-plus-testing
resource_class: large
environment:
CIRCLE_COMPARE_URL: << pipeline.project.git_url >>/compare/<< pipeline.git.base_revision >>..<<pipeline.git.revision>>
Expand All @@ -320,7 +320,7 @@ jobs:

kvasir-ubuntu-jdk8:
docker:
- image: mdernst/daikon-ubuntu-jdk8-plus
- image: mdernst/daikon-ubuntu-jdk8-plus-testing
resource_class: large
environment:
CIRCLE_COMPARE_URL: << pipeline.project.git_url >>/compare/<< pipeline.git.base_revision >>..<<pipeline.git.revision>>
Expand All @@ -342,7 +342,7 @@ jobs:

kvasir-ubuntu-jdk11:
docker:
- image: mdernst/daikon-ubuntu-jdk11-plus
- image: mdernst/daikon-ubuntu-jdk11-plus-testing
resource_class: large
environment:
CIRCLE_COMPARE_URL: << pipeline.project.git_url >>/compare/<< pipeline.git.base_revision >>..<<pipeline.git.revision>>
Expand All @@ -364,7 +364,7 @@ jobs:

kvasir-ubuntu-jdk17:
docker:
- image: mdernst/daikon-ubuntu-jdk17-plus
- image: mdernst/daikon-ubuntu-jdk17-plus-testing
resource_class: large
environment:
CIRCLE_COMPARE_URL: << pipeline.project.git_url >>/compare/<< pipeline.git.base_revision >>..<<pipeline.git.revision>>
Expand All @@ -386,7 +386,7 @@ jobs:

kvasir-ubuntu-jdk21:
docker:
- image: mdernst/daikon-ubuntu-jdk21-plus
- image: mdernst/daikon-ubuntu-jdk21-plus-testing
resource_class: large
environment:
CIRCLE_COMPARE_URL: << pipeline.project.git_url >>/compare/<< pipeline.git.base_revision >>..<<pipeline.git.revision>>
Expand Down Expand Up @@ -803,7 +803,7 @@ jobs:
# Checker Framework jar files in java/lib/ .
typecheck-with-bundled-CF-jdk21:
docker:
- image: mdernst/daikon-ubuntu-jdk21
- image: mdernst/daikon-ubuntu-jdk21-testing
resource_class: large
environment:
CIRCLE_COMPARE_URL: << pipeline.project.git_url >>/compare/<< pipeline.git.base_revision >>..<<pipeline.git.revision>>
Expand All @@ -827,7 +827,7 @@ jobs:

typecheck-with-latest-CF-jdk8:
docker:
- image: mdernst/daikon-ubuntu-jdk8
- image: mdernst/daikon-ubuntu-jdk8-testing
resource_class: large
environment:
CIRCLE_COMPARE_URL: << pipeline.project.git_url >>/compare/<< pipeline.git.base_revision >>..<<pipeline.git.revision>>
Expand All @@ -849,7 +849,7 @@ jobs:

typecheck-with-latest-CF-jdk11:
docker:
- image: mdernst/daikon-ubuntu-jdk11
- image: mdernst/daikon-ubuntu-jdk11-testing
resource_class: large
environment:
CIRCLE_COMPARE_URL: << pipeline.project.git_url >>/compare/<< pipeline.git.base_revision >>..<<pipeline.git.revision>>
Expand All @@ -871,7 +871,7 @@ jobs:

typecheck-with-latest-CF-jdk17:
docker:
- image: mdernst/daikon-ubuntu-jdk17
- image: mdernst/daikon-ubuntu-jdk17-testing
resource_class: large
environment:
CIRCLE_COMPARE_URL: << pipeline.project.git_url >>/compare/<< pipeline.git.base_revision >>..<<pipeline.git.revision>>
Expand All @@ -893,7 +893,7 @@ jobs:

typecheck-with-latest-CF-jdk21:
docker:
- image: mdernst/daikon-ubuntu-jdk21
- image: mdernst/daikon-ubuntu-jdk21-testing
resource_class: large
environment:
CIRCLE_COMPARE_URL: << pipeline.project.git_url >>/compare/<< pipeline.git.base_revision >>..<<pipeline.git.revision>>
Expand Down
52 changes: 26 additions & 26 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,30 +20,30 @@ env:
global:
- THIS_REPO=daikon
matrix:
- OS=ubuntu JDKVER=jdk8 GROUP=quick-txt-diff
- OS=ubuntu JDKVER=jdk11 GROUP=quick-txt-diff
- OS=ubuntu JDKVER=jdk17 GROUP=quick-txt-diff
- OS=ubuntu JDKVER=jdk8 GROUP=nonquick-txt-diff
- OS=ubuntu JDKVER=jdk11 GROUP=nonquick-txt-diff
- OS=ubuntu JDKVER=jdk17 GROUP=nonquick-txt-diff
- OS=ubuntu JDKVER=jdk8 GROUP=non-txt-diff
- OS=ubuntu JDKVER=jdk11 GROUP=non-txt-diff
- OS=ubuntu JDKVER=jdk17 GROUP=non-txt-diff
- OS=ubuntu JDKVER=jdk8-plus GROUP=misc
- OS=ubuntu JDKVER=jdk11-plus GROUP=misc
- OS=ubuntu JDKVER=jdk17-plus GROUP=misc
- OS=ubuntu JDKVER=jdk8-plus GROUP=kvasir
- OS=ubuntu JDKVER=jdk11-plus GROUP=kvasir
- OS=ubuntu JDKVER=jdk17-plus GROUP=kvasir
- OS=rockylinux JDKVER=jdk8 GROUP=nonquick-txt-diff
- OS=rockylinux JDKVER=jdk11 GROUP=nonquick-txt-diff
- OS=rockylinux JDKVER=jdk17 GROUP=nonquick-txt-diff
- OS=rockylinux JDKVER=jdk8-plus GROUP=misc
- OS=rockylinux JDKVER=jdk11-plus GROUP=misc
- OS=rockylinux JDKVER=jdk17-plus GROUP=misc
- OS=rockylinux JDKVER=jdk8-plus GROUP=kvasir
- OS=rockylinux JDKVER=jdk11-plus GROUP=kvasir
- OS=rockylinux JDKVER=jdk17-plus GROUP=kvasir
- OS=ubuntu JDKVER=jdk8 GROUP=quick-txt-diff DOCKERTESTING=-testing
- OS=ubuntu JDKVER=jdk11 GROUP=quick-txt-diff DOCKERTESTING=-testing
- OS=ubuntu JDKVER=jdk17 GROUP=quick-txt-diff DOCKERTESTING=-testing
- OS=ubuntu JDKVER=jdk8 GROUP=nonquick-txt-diff DOCKERTESTING=-testing
- OS=ubuntu JDKVER=jdk11 GROUP=nonquick-txt-diff DOCKERTESTING=-testing
- OS=ubuntu JDKVER=jdk17 GROUP=nonquick-txt-diff DOCKERTESTING=-testing
- OS=ubuntu JDKVER=jdk8 GROUP=non-txt-diff DOCKERTESTING=-testing
- OS=ubuntu JDKVER=jdk11 GROUP=non-txt-diff DOCKERTESTING=-testing
- OS=ubuntu JDKVER=jdk17 GROUP=non-txt-diff DOCKERTESTING=-testing
- OS=ubuntu JDKVER=jdk8-plus GROUP=misc DOCKERTESTING=-testing
- OS=ubuntu JDKVER=jdk11-plus GROUP=misc DOCKERTESTING=-testing
- OS=ubuntu JDKVER=jdk17-plus GROUP=misc DOCKERTESTING=-testing
- OS=ubuntu JDKVER=jdk8-plus GROUP=kvasir DOCKERTESTING=-testing
- OS=ubuntu JDKVER=jdk11-plus GROUP=kvasir DOCKERTESTING=-testing
- OS=ubuntu JDKVER=jdk17-plus GROUP=kvasir DOCKERTESTING=-testing
- OS=rockylinux JDKVER=jdk8 GROUP=nonquick-txt-diff DOCKERTESTING=-testing
- OS=rockylinux JDKVER=jdk11 GROUP=nonquick-txt-diff DOCKERTESTING=-testing
- OS=rockylinux JDKVER=jdk17 GROUP=nonquick-txt-diff DOCKERTESTING=-testing
- OS=rockylinux JDKVER=jdk8-plus GROUP=misc DOCKERTESTING=-testing
- OS=rockylinux JDKVER=jdk11-plus GROUP=misc DOCKERTESTING=-testing
- OS=rockylinux JDKVER=jdk17-plus GROUP=misc DOCKERTESTING=-testing
- OS=rockylinux JDKVER=jdk8-plus GROUP=kvasir DOCKERTESTING=-testing
- OS=rockylinux JDKVER=jdk11-plus GROUP=kvasir DOCKERTESTING=-testing
- OS=rockylinux JDKVER=jdk17-plus GROUP=kvasir DOCKERTESTING=-testing

# Currently-failing jobs
# This section is temporary and should be commented out when no jobs are failing.
Expand All @@ -56,7 +56,7 @@ env:
# Running this first gives two tries in case of network lossage.
before_script:
- python -c "import fcntl; fcntl.fcntl(1, fcntl.F_SETFL, 0)"
- (timeout 5m docker --debug=true pull mdernst/daikon-$OS-$JDKVER || [ $? -eq 124 ] && echo "docker pull timed out") || true
- (timeout 5m docker --debug=true pull mdernst/daikon-$OS-$JDKVER$DOCKERTESTING || [ $? -eq 124 ] && echo "docker pull timed out") || true

# The git commands are tried twice, in case of temporary network failure.
# The fcntl line works around a bug where Travis truncates logs and fails.
Expand All @@ -76,7 +76,7 @@ script:
- echo "TRAVIS_PULL_REQUEST_SHA=${TRAVIS_PULL_REQUEST_SHA}"
- echo "TRAVIS_REPO_SLUG=${TRAVIS_REPO_SLUG}"
- >-
docker --debug=true run -v $HOME/.gradle:/root/.gradle mdernst/daikon-$OS-$JDKVER /bin/bash -c "true &&
docker --debug=true run -v $HOME/.gradle:/root/.gradle mdernst/daikon-$OS-$JDKVER$DOCKERTESTING /bin/bash -c "true &&
if [ $TRAVIS_EVENT_TYPE = pull_request ] ; then
git clone --quiet $REMOTE_ORIGIN_URL $THIS_REPO || (sleep 1m && git clone --quiet $REMOTE_ORIGIN_URL $THIS_REPO)
cd $THIS_REPO
Expand Down
Loading
Loading