Skip to content

Amend #4961, bump Java 21. #4966

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

Merged
gchatelet merged 12 commits into from
Dec 27, 2025
Merged

Amend #4961, bump Java 21. #4966

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
331ed32
Amend #4961, add missing `.in` files.
gchatelet Dec 24, 2025
60dd8b3
Use environment variables instead
gchatelet Dec 26, 2025
94cebb8
Remove temurin leftover
gchatelet Dec 26, 2025
fb0c063
Update path to java for correct version reporting
gchatelet Dec 26, 2025
2200cf5
Add missing bin directory
gchatelet Dec 26, 2025
3c65c9c
Use `env` instead of appending to `GITHUB_ENV`
gchatelet Dec 26, 2025
0bf1e3d
Remove double quotes around env
gchatelet Dec 26, 2025
5503282
Back to appending to `$GITHUB_ENV`
gchatelet Dec 26, 2025
5e4007f
Put `JAVA_HOME/bin` in the github path.
gchatelet Dec 26, 2025
7cd134c
Add Java 21 to path instead of setting `JAVA_HOME`.
gchatelet Dec 26, 2025
573179b
Remove "check Java" and rely on JAVA_HOME for CMake and Maven
gchatelet Dec 26, 2025
3b5180a
Fix mixed up commands between GITHUB_ENV and GITHUB_PATH
gchatelet Dec 26, 2025
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
3 changes: 2 additions & 1 deletion .github/workflows/amd64_linux_cmake_java.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,9 @@ jobs:
sudo apt update
sudo apt install -y ninja-build ccache swig
swig -version
echo "JAVA_HOME=$JAVA_HOME_21_X64" >> $GITHUB_ENV
- name: Check java
run: java -version
run: $JAVA_HOME/bin/java -version

# RESTORING CACHES
- name: Restore CMake dependency source code
Expand Down
3 changes: 2 additions & 1 deletion .github/workflows/amd64_macos_cmake_java.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,9 @@ jobs:
run: |
brew install ccache swig
swig -version
echo "JAVA_HOME=$JAVA_HOME_21_X64" >> $GITHUB_ENV
- name: Check java
run: java -version
run: $JAVA_HOME/bin/java -version

# RESTORING CACHES
- name: Restore CMake dependency source code
Expand Down
3 changes: 2 additions & 1 deletion .github/workflows/arm64_macos_cmake_java.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,9 @@ jobs:
run: |
brew install ccache swig
swig -version
echo "JAVA_HOME=$JAVA_HOME_21_arm64" >> $GITHUB_ENV
- name: Check java
run: java -version
run: $JAVA_HOME/bin/java -version

# RESTORING CACHES
- name: Restore CMake dependency source code
Expand Down
Loading