Skip to content

Commit 302ad17

Browse files
authored
upgrade to java 21 & fix tests (#329)
1 parent d20d64f commit 302ad17

File tree

4 files changed

+6
-6
lines changed

4 files changed

+6
-6
lines changed

r-datascience/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ FROM $BASE_IMAGE
33

44
LABEL maintainer="InseeFrLab <innovation@insee.fr>"
55

6-
ARG JAVA_VERSION="17"
6+
ARG JAVA_VERSION="21"
77
ENV JAVA_VERSION=${JAVA_VERSION}
88
ENV JAVA_HOME="/usr/lib/jvm/java-$JAVA_VERSION-openjdk-amd64"
99
ENV PATH="${JAVA_HOME}/bin:${PATH}"

r-datascience/tests.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ commandTests:
3939
- name: "Does the binary exists?"
4040
command: "which"
4141
args: ["java"]
42-
expectedOutput: ["/usr/lib/jvm/java-17-openjdk-amd64/bin/java"]
42+
expectedOutput: ["/usr/lib/jvm/java-21-openjdk-amd64/bin/java"]
4343
- name: "Does the binary exists?"
4444
command: "which"
4545
args: ["duckdb"]

spark/tests.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,8 +49,8 @@ commandTests:
4949
- name: "Does the binary exists?"
5050
command: "which"
5151
args: ["java"]
52-
expectedOutput: ["/usr/lib/jvm/java-17-openjdk-amd64/bin/java"]
52+
expectedOutput: ["/usr/lib/jvm/java-21-openjdk-amd64/bin/java"]
5353
- name: "Does the binary exists?"
5454
command: "which"
5555
args: ["duckdb"]
56-
expectedOutput: ["/usr/local/bin/duckdb"]
56+
expectedOutput: ["/usr/local/bin/duckdb"]

utils/build-chains.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@ DOCKER_BUILD_ARGS=""
1111

1212
# Build process
1313

14-
PYTHON_VERSIONS=("3.13.5" "3.12.11")
14+
PYTHON_VERSIONS=("3.13.8" "3.12.12")
1515
R_VERSIONS=("4.5.1" "4.4.3")
16-
SPARK_VERSION=3.5.5
16+
SPARK_VERSION=4.0.1
1717

1818
for py_ver in "${PYTHON_VERSIONS[@]}"; do
1919
python3 utils/build-chain.py --chain vscode-python --py_version $py_ver $DOCKER_BUILD_ARGS

0 commit comments

Comments
 (0)