Merge branch 'master' into fix-batch-size

elastic · Sep 13, 2024 · fec9388 · fec9388
2 parents 3de64ed + c195f2c
commit fec9388
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/.buildkite/it/run.sh b/.buildkite/it/run.sh
@@ -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:"
 

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -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