Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -216,12 +216,12 @@ jobs:
with:
name: combined-test-catalog

# JOOQ classes are pre-committed with JDK 23 (includes @SuppressWarnings("this-escape") annotations)
# JOOQ classes are pre-committed with JDK 25 (includes @SuppressWarnings("this-escape") annotations)
# No regeneration needed for any JDK version
- name: Verify JOOQ classes are up-to-date in release branches
if: startsWith(github.ref_name, 'inkless-')
run: |
git diff --exit-code --stat -- storage/inkless/src/main/jooq || (echo "JOOQ classes are not up-to-date, please run 'make jooq' with JDK 23 and commit the changes" && exit 1)
git diff --exit-code --stat -- storage/inkless/src/main/jooq || (echo "JOOQ classes are not up-to-date, please run 'make jooq' with JDK 25 and commit the changes" && exit 1)
- name: JUnit Tests
id: junit-test
uses: ./.github/actions/run-gradle
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/inkless-nightly.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
strategy:
fail-fast: false
matrix:
java: [ 17, 23 ] # If we change these, make sure to adjust ci-complete.yml
java: [ 17, 25 ] # If we change these, make sure to adjust ci-complete.yml
name: JUnit tests Java ${{ matrix.java }}
steps:
- name: Checkout code
Expand Down
12 changes: 6 additions & 6 deletions .github/workflows/inkless.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,12 +36,12 @@ jobs:
with:
python-version: '3.12'

# Generate JOOQ classes with JDK 23 to include @SuppressWarnings("this-escape") annotations
- name: Setup JDK 23 for JOOQ generation
# Generate JOOQ classes with JDK 25 to include @SuppressWarnings("this-escape") annotations
- name: Setup JDK 25 for JOOQ generation
uses: actions/setup-java@v4
with:
distribution: temurin
java-version: 23
java-version: 25

- name: Generate JOOQ classes
run: make jooq
Expand All @@ -53,7 +53,7 @@ jobs:
git status -s -- storage/inkless/src/main/jooq
git diff --stat -- storage/inkless/src/main/jooq
echo ""
echo "Please run 'make jooq' with JDK 23 and commit the changes"
echo "Please run 'make jooq' with JDK 25 and commit the changes"
exit 1
else
echo "JOOQ classes are up-to-date."
Expand Down Expand Up @@ -121,7 +121,7 @@ jobs:
strategy:
fail-fast: false
matrix:
java: [ 17, 23 ] # If we change these, make sure to adjust ci-complete.yml
java: [ 17, 25 ] # If we change these, make sure to adjust ci-complete.yml
name: JUnit tests Java ${{ matrix.java }}
steps:
- name: Checkout code
Expand All @@ -145,7 +145,7 @@ jobs:
# --no-scan: Don't attempt to publish the scan yet. We want to archive it first.
# --continue: Keep running even if a test fails
# -PcommitId Prevent the Git SHA being written into the jar files (which breaks caching)
# JOOQ classes are pre-committed with JDK 23, so no regeneration needed
# JOOQ classes are pre-committed with JDK 25, so no regeneration needed
id: junit-test
env:
TIMEOUT_MINUTES: 30
Expand Down
2 changes: 1 addition & 1 deletion docs/inkless/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ Each release on version branches represents stable progress of the Inkless imple

## Requirements

- Java 17 or 23 (Java 11 for clients only)
- Java 17 or 25 (Java 11 for clients only)
- Scala 2.13.16
- Docker (required for building - jOOQ plugin uses a PostgreSQL container for Flyway migrations and class generation)
- Object storage (AWS S3, Google Cloud Storage, or Azure Blob Storage)
Expand Down