Skip to content

Commit

Permalink
Switch to JDK 21 (#1875)
Browse files Browse the repository at this point in the history
* Switch to JDK 21 for building ES
  • Loading branch information
gareth-ellis authored Sep 13, 2024
1 parent 5dc558f commit c195f2c
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
4 changes: 2 additions & 2 deletions .buildkite/it/run.sh
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,9 @@ retry 5 sudo apt-get update
retry 5 sudo apt-get install -y \
"python${PYTHON_VERSION}" "python${PYTHON_VERSION}-dev" "python${PYTHON_VERSION}-venv" \
git make jq docker \
openjdk-17-jdk-headless openjdk-11-jdk-headless
openjdk-21-jdk-headless openjdk-11-jdk-headless
export JAVA11_HOME=/usr/lib/jvm/java-11-openjdk-amd64
export JAVA17_HOME=/usr/lib/jvm/java-17-openjdk-amd64
export JAVA21_HOME=/usr/lib/jvm/java-21-openjdk-amd64

echo "--- Run IT test :pytest:"

Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -74,11 +74,11 @@ jobs:
python-version: "3.12"
cache: pip
cache-dependency-path: pyproject.toml
- uses: actions/setup-java@v3
- uses: actions/setup-java@v4
with:
distribution: "temurin"
java-version: "17"
- run: echo "JAVA17_HOME=$JAVA_HOME_17_X64" >> $GITHUB_ENV
java-version: "21"
- run: echo "JAVA21_HOME=$JAVA_HOME_21_X64" >> $GITHUB_ENV
- run: echo "JAVA11_HOME=$JAVA_HOME_11_X64" >> $GITHUB_ENV
- name: "Install dependencies"
run: python -m pip install --upgrade nox
Expand Down

0 comments on commit c195f2c

Please sign in to comment.