Skip to content

Update all JDK version to 17 #22786

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
merged 8 commits into from
Nov 12, 2024
Merged

Update all JDK version to 17 #22786

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
6f6d7df
Update all JDK version to 17
jchen351 Nov 8, 2024
c5cf975
java/src/test/android/build.gradle
jchen351 Nov 10, 2024
1474a61
java/src/test/android/build.gradle
jchen351 Nov 11, 2024
a7c8f5e
$PACKAGE_MANAGER install graphviz
jchen351 Nov 11, 2024
42053a4
Using os.add_dll_directory and ctypes.CDLL to load dynamic library
jchen351 Nov 11, 2024
a8fdfe1
remove `rpm -Uvh https://packages.microsoft.com/config/centos/8/packa…
jchen351 Nov 11, 2024
8a0f9e3
Merge branch 'main' into Cjian/jdk17
jchen351 Nov 11, 2024
4b51b64
rolling back accidentally added yml files
jchen351 Nov 11, 2024
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
2 changes: 1 addition & 1 deletion tools/android_custom_build/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ RUN apt-get update && apt-get install --yes --no-install-recommends \
ca-certificates \
git \
ninja-build \
openjdk-11-jdk-headless \
openjdk-17-jdk-headless \
python3-dev \
python3-numpy \
python3-pip \
Expand Down
2 changes: 1 addition & 1 deletion tools/ci_build/github/azure-pipelines/bigmodels-ci-pipeline.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ parameters:

variables:
- name: docker_base_image
value: onnxruntimebuildcache.azurecr.io/internal/azureml/onnxruntime/build/cuda11_x64_almalinux8_gcc11:20241020.1
value: onnxruntimebuildcache.azurecr.io/internal/azureml/onnxruntime/build/cuda11_x64_almalinux8_gcc11:20241111.1
- name: linux_trt_version
value: 10.3.0.26-1.cuda11.8
- name: Repository
Expand Down
4 changes: 2 additions & 2 deletions tools/ci_build/github/azure-pipelines/linux-gpu-ci-pipeline.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,9 +49,9 @@ parameters:
variables:
- name: docker_base_image
${{ if eq(parameters.CudaVersion, '11.8') }}:
value: onnxruntimebuildcache.azurecr.io/internal/azureml/onnxruntime/build/cuda11_x64_almalinux8_gcc11:20241020.1
value: onnxruntimebuildcache.azurecr.io/internal/azureml/onnxruntime/build/cuda11_x64_almalinux8_gcc11:20241111.1
${{ if eq(parameters.CudaVersion, '12.2') }}:
value: onnxruntimebuildcache.azurecr.io/internal/azureml/onnxruntime/build/cuda12_x64_ubi8_gcc12:20241020.1
value: onnxruntimebuildcache.azurecr.io/internal/azureml/onnxruntime/build/cuda12_x64_ubi8_gcc12:20241111.1

- name: Repository
${{ if eq(parameters.CudaVersion, '11.8') }}:
Expand Down
4 changes: 2 additions & 2 deletions tools/ci_build/github/azure-pipelines/linux-gpu-tensorrt-ci-pipeline.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,9 +40,9 @@ variables:
- template: templates/common-variables.yml
- name: docker_base_image
${{ if eq(parameters.CudaVersion, '11.8') }}:
value: onnxruntimebuildcache.azurecr.io/internal/azureml/onnxruntime/build/cuda11_x64_almalinux8_gcc11:20241020.1
value: onnxruntimebuildcache.azurecr.io/internal/azureml/onnxruntime/build/cuda11_x64_almalinux8_gcc11:20241111.1
${{ if eq(parameters.CudaVersion, '12.2') }}:
value: onnxruntimebuildcache.azurecr.io/internal/azureml/onnxruntime/build/cuda12_x64_ubi8_gcc12:20241020.1
value: onnxruntimebuildcache.azurecr.io/internal/azureml/onnxruntime/build/cuda12_x64_ubi8_gcc12:20241111.1
- name: linux_trt_version
${{ if eq(parameters.CudaVersion, '11.8') }}:
value: ${{ variables.linux_trt_version_cuda11 }}
Expand Down
2 changes: 1 addition & 1 deletion tools/ci_build/github/azure-pipelines/py-cuda-alt-package-test-pipeline.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ stages:
machine_pool: 'Onnxruntime-Linux-GPU'
python_wheel_suffix: '_gpu'
timeout: 480
docker_base_image: onnxruntimebuildcache.azurecr.io/internal/azureml/onnxruntime/build/cuda11_x64_almalinux8_gcc11:20241020.1
docker_base_image: onnxruntimebuildcache.azurecr.io/internal/azureml/onnxruntime/build/cuda11_x64_almalinux8_gcc11:20241111.1
trt_version: '10.6.0.26-1.cuda11.8'
cuda_version: '11.8'

2 changes: 1 addition & 1 deletion tools/ci_build/github/azure-pipelines/py-cuda-package-test-pipeline.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,6 @@ stages:
machine_pool: 'Onnxruntime-Linux-GPU'
python_wheel_suffix: '_gpu'
timeout: 480
docker_base_image: onnxruntimebuildcache.azurecr.io/internal/azureml/onnxruntime/build/cuda12_x64_ubi8_gcc12:20241020.1
docker_base_image: onnxruntimebuildcache.azurecr.io/internal/azureml/onnxruntime/build/cuda12_x64_ubi8_gcc12:20241111.1
cuda_version: '12.2'

4 changes: 2 additions & 2 deletions tools/ci_build/github/azure-pipelines/stages/java-cuda-packaging-stage.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,9 +148,9 @@ stages:
value: false
- name: docker_base_image
${{ if eq(parameters.CudaVersion, '11.8') }}:
value: onnxruntimebuildcache.azurecr.io/internal/azureml/onnxruntime/build/cuda11_x64_almalinux8_gcc11:20241020.1
value: onnxruntimebuildcache.azurecr.io/internal/azureml/onnxruntime/build/cuda11_x64_almalinux8_gcc11:20241111.1
${{ if eq(parameters.CudaVersion, '12.2') }}:
value: onnxruntimebuildcache.azurecr.io/internal/azureml/onnxruntime/build/cuda12_x64_ubi8_gcc12:20241020.1
value: onnxruntimebuildcache.azurecr.io/internal/azureml/onnxruntime/build/cuda12_x64_ubi8_gcc12:20241111.1
timeoutInMinutes: 60

steps:
Expand Down
4 changes: 2 additions & 2 deletions tools/ci_build/github/azure-pipelines/stages/jobs/py-linux-cuda-package-test-job.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,9 +45,9 @@ jobs:
- template: ../../templates/common-variables.yml
- name: docker_base_image
${{ if eq(parameters.CudaVersion, '11.8') }}:
value: onnxruntimebuildcache.azurecr.io/internal/azureml/onnxruntime/build/cuda11_x64_almalinux8_gcc11:20241020.1
value: onnxruntimebuildcache.azurecr.io/internal/azureml/onnxruntime/build/cuda11_x64_almalinux8_gcc11:20241111.1
${{ if eq(parameters.CudaVersion, '12.2') }}:
value: onnxruntimebuildcache.azurecr.io/internal/azureml/onnxruntime/build/cuda12_x64_ubi8_gcc12:20241020.1
value: onnxruntimebuildcache.azurecr.io/internal/azureml/onnxruntime/build/cuda12_x64_ubi8_gcc12:20241111.1
- name: linux_trt_version
${{ if eq(parameters.CudaVersion, '11.8') }}:
value: ${{ variables.linux_trt_version_cuda11 }}
Expand Down
4 changes: 2 additions & 2 deletions tools/ci_build/github/azure-pipelines/stages/py-gpu-packaging-stage.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,9 +68,9 @@ stages:
cmake_build_type: ${{ parameters.cmake_build_type }}
cuda_version: ${{ parameters.cuda_version }}
${{ if eq(parameters.cuda_version, '11.8') }}:
docker_base_image: onnxruntimebuildcache.azurecr.io/internal/azureml/onnxruntime/build/cuda11_x64_almalinux8_gcc11:20241020.1
docker_base_image: onnxruntimebuildcache.azurecr.io/internal/azureml/onnxruntime/build/cuda11_x64_almalinux8_gcc11:20241111.1
${{ if eq(parameters.cuda_version, '12.2') }}:
docker_base_image: onnxruntimebuildcache.azurecr.io/internal/azureml/onnxruntime/build/cuda12_x64_ubi8_gcc12:20241020.1
docker_base_image: onnxruntimebuildcache.azurecr.io/internal/azureml/onnxruntime/build/cuda12_x64_ubi8_gcc12:20241111.1

- ${{ if eq(parameters.enable_windows_dml, true) }}:
- ${{ each python_version in parameters.PythonVersions }}:
Expand Down
2 changes: 1 addition & 1 deletion tools/ci_build/github/azure-pipelines/templates/jobs/win-ci-vs-2022-job.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ jobs:
- ${{ if eq(parameters.buildArch, 'x64') }}:
- task: JavaToolInstaller@0
inputs:
versionSpec: '11'
versionSpec: '17'
jdkArchitectureOption: ${{ parameters.buildArch }}
jdkSourceOption: 'PreInstalled'

Expand Down
2 changes: 1 addition & 1 deletion tools/ci_build/github/azure-pipelines/templates/mac-cpu-packing-jobs.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ jobs:

- task: JavaToolInstaller@0
inputs:
versionSpec: "11"
versionSpec: "17"
jdkArchitectureOption: "x64"
jdkSourceOption: 'PreInstalled'

Expand Down
4 changes: 2 additions & 2 deletions tools/ci_build/github/azure-pipelines/templates/win-ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,7 @@ stages:
- ${{ if eq(parameters['buildJava'], 'true') }}:
- task: JavaToolInstaller@0
inputs:
versionSpec: "11"
versionSpec: "17"
jdkArchitectureOption: ${{ parameters.buildArch }}
jdkSourceOption: 'PreInstalled'

Expand Down Expand Up @@ -368,7 +368,7 @@ stages:
- ${{ if eq(parameters['buildJava'], 'true') }}:
- task: JavaToolInstaller@0
inputs:
versionSpec: "11"
versionSpec: "17"
jdkArchitectureOption: ${{ parameters.buildArch }}
jdkSourceOption: 'PreInstalled'

Expand Down
4 changes: 2 additions & 2 deletions tools/ci_build/github/linux/docker/Dockerfile.manylinux2_28_cpu
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
FROM onnxruntimebuildcache.azurecr.io/internal/azureml/onnxruntime/build/cpu_x64_ubi8_gcc12:20241020.1
FROM onnxruntimebuildcache.azurecr.io/internal/azureml/onnxruntime/build/cpu_x64_ubi8_gcc12:20241111.1

ENV JAVA_HOME=/usr/lib/jvm/msopenjdk-11
ENV JAVA_HOME=/usr/lib/jvm/msopenjdk-17

ADD scripts /tmp/scripts
RUN cd /tmp/scripts && /tmp/scripts/manylinux/install_centos.sh
Expand Down
2 changes: 1 addition & 1 deletion tools/ci_build/github/linux/docker/Dockerfile.manylinux2_28_cuda
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ else \
echo "TRT_VERSION is none skipping Tensor RT Installation" ; \
fi

ENV JAVA_HOME=/usr/lib/jvm/msopenjdk-11
ENV JAVA_HOME=/usr/lib/jvm/msopenjdk-17
#Add our own dependencies
ADD scripts /tmp/scripts
RUN cd /tmp/scripts && /tmp/scripts/manylinux/install_centos.sh && /tmp/scripts/manylinux/install_deps.sh && rm -rf /tmp/scripts
Expand Down
2 changes: 1 addition & 1 deletion tools/ci_build/github/linux/docker/inference/aarch64/python/cpu/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM onnxruntimebuildcache.azurecr.io/internal/azureml/onnxruntime/build/cpu_aarch64_ubi8_gcc12:20241020.1
FROM onnxruntimebuildcache.azurecr.io/internal/azureml/onnxruntime/build/cpu_aarch64_ubi8_gcc12:20241111.1

ADD scripts /tmp/scripts
RUN cd /tmp/scripts && /tmp/scripts/install_centos.sh && /tmp/scripts/install_deps.sh && rm -rf /tmp/scripts
Expand Down
4 changes: 2 additions & 2 deletions tools/ci_build/github/linux/docker/inference/x86_64/default/cpu/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@
ARG BASEIMAGE=amd64/almalinux:8
FROM $BASEIMAGE

ENV PATH=/usr/lib/jvm/msopenjdk-11/bin:/opt/rh/gcc-toolset-12/root/usr/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
ENV PATH=/usr/lib/jvm/msopenjdk-17/bin:/opt/rh/gcc-toolset-12/root/usr/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
ENV LANG=en_US.UTF-8
ENV LC_ALL=en_US.UTF-8
ENV JAVA_HOME=/usr/lib/jvm/msopenjdk-11
ENV JAVA_HOME=/usr/lib/jvm/msopenjdk-17
ADD scripts /tmp/scripts
RUN cd /tmp/scripts && /tmp/scripts/install_centos.sh && /tmp/scripts/install_deps.sh && rm -rf /tmp/scripts

Expand Down
3 changes: 1 addition & 2 deletions tools/ci_build/github/linux/docker/inference/x86_64/default/cpu/scripts/install_centos.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ set -e -x
if [ ! -f /etc/yum.repos.d/microsoft-prod.repo ]; then
os_major_version=$(tr -dc '0-9.' < /etc/redhat-release |cut -d \. -f1)
echo "installing for CentOS version : $os_major_version"
rpm -Uvh https://packages.microsoft.com/config/centos/$os_major_version/packages-microsoft-prod.rpm
fi
dnf install -y python3.12-pip python3.12-devel glibc-langpack-\* glibc-locale-source which redhat-lsb-core expat-devel tar unzip zlib-devel make bzip2 bzip2-devel msopenjdk-11 graphviz gcc-toolset-12-binutils gcc-toolset-12-gcc gcc-toolset-12-gcc-c++ gcc-toolset-12-gcc-gfortran gcc-toolset-12-libasan-devel libasan.x86_64
dnf install -y python3.12-pip python3.12-devel glibc-langpack-\* glibc-locale-source which redhat-lsb-core expat-devel tar unzip zlib-devel make bzip2 bzip2-devel graphviz gcc-toolset-12-binutils gcc-toolset-12-gcc gcc-toolset-12-gcc-c++ gcc-toolset-12-gcc-gfortran gcc-toolset-12-libasan-devel libasan.x86_64
locale
7 changes: 3 additions & 4 deletions tools/ci_build/github/linux/docker/inference/x86_64/default/cuda11/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,9 @@
# Licensed under the MIT License.

# This file is used by Zip-Nuget Packaging NoContribOps Pipeline,Zip-Nuget-Java Packaging Pipeline
FROM onnxruntimebuildcache.azurecr.io/internal/azureml/onnxruntime/build/cuda11_x64_almalinux8_gcc11_dotnet:20241020.1
FROM onnxruntimebuildcache.azurecr.io/internal/azureml/onnxruntime/build/cuda11_x64_almalinux8_gcc11_dotnet:20241111.1

ARG TRT_VERSION
RUN rpm -Uvh https://packages.microsoft.com/config/centos/8/packages-microsoft-prod.rpm && dnf install -y msopenjdk-11
#Install TensorRT only if TRT_VERSION is not empty
RUN if [ -n "$TRT_VERSION" ]; then \
echo "TRT_VERSION is $TRT_VERSION" && \
Expand All @@ -31,10 +30,10 @@ else \
echo "TRT_VERSION is none skipping Tensor RT Installation" ; \
fi

ENV PATH=/usr/lib/jvm/msopenjdk-11/bin:$PATH
ENV PATH=/usr/lib/jvm/msopenjdk-17/bin:$PATH
ENV LANG=en_US.UTF-8
ENV LC_ALL=en_US.UTF-8
ENV JAVA_HOME=/usr/lib/jvm/msopenjdk-11
ENV JAVA_HOME=/usr/lib/jvm/msopenjdk-17
ENV CUDAHOSTCXX=/opt/rh/gcc-toolset-11/root/usr/bin/g++
ADD scripts /tmp/scripts
RUN cd /tmp/scripts && /tmp/scripts/install_deps.sh && rm -rf /tmp/scripts
Expand Down
8 changes: 4 additions & 4 deletions tools/ci_build/github/linux/docker/inference/x86_64/default/cuda12/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# Licensed under the MIT License.

# This file is used by Zip-Nuget Packaging NoContribOps Pipeline,Zip-Nuget-Java Packaging Pipeline
FROM onnxruntimebuildcache.azurecr.io/internal/azureml/onnxruntime/build/cuda12_x64_ubi8_gcc12_dotnet:20241020.1
FROM onnxruntimebuildcache.azurecr.io/internal/azureml/onnxruntime/build/cuda12_x64_ubi8_gcc12_dotnet:20241111.1
ARG TRT_VERSION

#Install TensorRT only if TRT_VERSION is not empty
Expand Down Expand Up @@ -38,9 +38,9 @@ ENV LC_ALL=en_US.UTF-8
ENV CUDAHOSTCXX=/opt/rh/gcc-toolset-12/root/usr/bin/g++
ADD scripts /tmp/scripts
RUN sed -i 's/enabled\s*=\s*1/enabled = 1\nexclude=dotnet* aspnet* netstandard*/g' /etc/yum.repos.d/ubi.repo && \
rpm -Uvh https://packages.microsoft.com/config/centos/8/packages-microsoft-prod.rpm && dnf install -y msopenjdk-11 && cd /tmp/scripts && /tmp/scripts/install_deps.sh && rm -rf /tmp/scripts
ENV PATH=/usr/lib/jvm/msopenjdk-11/bin:$PATH
ENV JAVA_HOME=/usr/lib/jvm/msopenjdk-11
cd /tmp/scripts && /tmp/scripts/install_deps.sh && rm -rf /tmp/scripts
ENV PATH=/usr/lib/jvm/msopenjdk-17/bin:$PATH
ENV JAVA_HOME=/usr/lib/jvm/msopenjdk-17
ARG BUILD_UID=1001
ARG BUILD_USER=onnxruntimedev
RUN adduser --uid $BUILD_UID $BUILD_USER
Expand Down
2 changes: 1 addition & 1 deletion tools/ci_build/github/linux/docker/inference/x86_64/python/cpu/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM onnxruntimebuildcache.azurecr.io/internal/azureml/onnxruntime/build/cpu_x64_ubi8_gcc12:20241020.1
FROM onnxruntimebuildcache.azurecr.io/internal/azureml/onnxruntime/build/cpu_x64_ubi8_gcc12:20241111.1

ADD scripts /tmp/scripts
RUN cd /tmp/scripts && /tmp/scripts/install_centos.sh && rm -rf /tmp/scripts
Expand Down
2 changes: 1 addition & 1 deletion tools/ci_build/github/linux/docker/scripts/install_java.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ if [ -f /etc/redhat-release ]; then
dnf install -y java-11-openjdk-devel \
&& dnf clean dbcache
elif [ -f /etc/os-release ]; then
apt-get update && apt-get install -y openjdk-11-jdk
apt-get update && apt-get install -y openjdk-17-jdk
else
echo "Unsupported OS"
exit 1
Expand Down
2 changes: 1 addition & 1 deletion tools/ci_build/github/linux/docker/scripts/install_ubuntu.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/bin/bash
set -e
while getopts p:d: parameter_Option
do case "${parameter_Option}"

Check warning on line 4 in tools/ci_build/github/linux/docker/scripts/install_ubuntu.sh

View workflow job for this annotation

GitHub Actions / Optional Lint 

[shellcheck] reported by reviewdog 🐶
Invalid flags are not handled. Add a *) case.

Raw Output:
./tools/ci_build/github/linux/docker/scripts/install_ubuntu.sh:4:4: warning: Invalid flags are not handled. Add a *) case. (ShellCheck.SC2220)
in
p) PYTHON_VER=${OPTARG};;
d) DEVICE_TYPE=${OPTARG};;
Expand Down Expand Up @@ -49,25 +49,25 @@
zip \
rsync libunwind8 libpng-dev libexpat1-dev \
python3-setuptools python3-numpy python3-wheel python3-pip python3-pytest python3-distutils \
openjdk-11-jdk \
openjdk-17-jdk \
graphviz"


if [ $DEVICE_TYPE = "Normal" ]; then

Check warning on line 56 in tools/ci_build/github/linux/docker/scripts/install_ubuntu.sh

View workflow job for this annotation

GitHub Actions / Optional Lint 

[shellcheck] reported by reviewdog 🐶
Double quote to prevent globbing and word splitting.

Raw Output:
./tools/ci_build/github/linux/docker/scripts/install_ubuntu.sh:56:6: info: Double quote to prevent globbing and word splitting. (ShellCheck.SC2086)
PACKAGE_LIST="$PACKAGE_LIST libedit-dev libxml2-dev python3-packaging"
fi

PACKAGE_LIST="$PACKAGE_LIST libicu-dev"

apt-get install -y --no-install-recommends $PACKAGE_LIST

Check warning on line 62 in tools/ci_build/github/linux/docker/scripts/install_ubuntu.sh

View workflow job for this annotation

GitHub Actions / Optional Lint 

[shellcheck] reported by reviewdog 🐶
Double quote to prevent globbing and word splitting.

Raw Output:
./tools/ci_build/github/linux/docker/scripts/install_ubuntu.sh:62:44: info: Double quote to prevent globbing and word splitting. (ShellCheck.SC2086)

locale-gen en_US.UTF-8
update-locale LANG=en_US.UTF-8

if [ "$OS_VERSION" = "20.04" ]; then
# The defaul version of python is 3.8
major=$(echo $PYTHON_VER | cut -d. -f1)

Check warning on line 69 in tools/ci_build/github/linux/docker/scripts/install_ubuntu.sh

View workflow job for this annotation

GitHub Actions / Optional Lint 

[shellcheck] reported by reviewdog 🐶
Double quote to prevent globbing and word splitting.

Raw Output:
./tools/ci_build/github/linux/docker/scripts/install_ubuntu.sh:69:18: info: Double quote to prevent globbing and word splitting. (ShellCheck.SC2086)
minor=$(echo $PYTHON_VER | cut -d. -f2)

Check warning on line 70 in tools/ci_build/github/linux/docker/scripts/install_ubuntu.sh

View workflow job for this annotation

GitHub Actions / Optional Lint 

[shellcheck] reported by reviewdog 🐶
Double quote to prevent globbing and word splitting.

Raw Output:
./tools/ci_build/github/linux/docker/scripts/install_ubuntu.sh:70:18: info: Double quote to prevent globbing and word splitting. (ShellCheck.SC2086)
if [ "$major" -lt 3 ] || [ "$major" -eq 3 ] && [ "$minor" -lt 8 ]; then
PYTHON_VER="3.8"
fi
Expand All @@ -75,11 +75,11 @@
add-apt-repository -y ppa:deadsnakes/ppa
apt-get update
apt-get install -y --no-install-recommends \
python${PYTHON_VER} \

Check warning on line 78 in tools/ci_build/github/linux/docker/scripts/install_ubuntu.sh

View workflow job for this annotation

GitHub Actions / Optional Lint 

[shellcheck] reported by reviewdog 🐶
Double quote to prevent globbing and word splitting.

Raw Output:
./tools/ci_build/github/linux/docker/scripts/install_ubuntu.sh:78:23: info: Double quote to prevent globbing and word splitting. (ShellCheck.SC2086)
python${PYTHON_VER}-dev

Check warning on line 79 in tools/ci_build/github/linux/docker/scripts/install_ubuntu.sh

View workflow job for this annotation

GitHub Actions / Optional Lint 

[shellcheck] reported by reviewdog 🐶
Double quote to prevent globbing and word splitting.

Raw Output:
./tools/ci_build/github/linux/docker/scripts/install_ubuntu.sh:79:23: info: Double quote to prevent globbing and word splitting. (ShellCheck.SC2086)
update-alternatives --install /usr/bin/python3 python3 /usr/bin/python${PYTHON_VER} 1

Check warning on line 80 in tools/ci_build/github/linux/docker/scripts/install_ubuntu.sh

View workflow job for this annotation

GitHub Actions / Optional Lint 

[shellcheck] reported by reviewdog 🐶
Double quote to prevent globbing and word splitting.

Raw Output:
./tools/ci_build/github/linux/docker/scripts/install_ubuntu.sh:80:79: info: Double quote to prevent globbing and word splitting. (ShellCheck.SC2086)
update-alternatives --install /usr/bin/python3 python3 /usr/bin/python3.8 2
update-alternatives --set python3 /usr/bin/python${PYTHON_VER}

Check warning on line 82 in tools/ci_build/github/linux/docker/scripts/install_ubuntu.sh

View workflow job for this annotation

GitHub Actions / Optional Lint 

[shellcheck] reported by reviewdog 🐶
Double quote to prevent globbing and word splitting.

Raw Output:
./tools/ci_build/github/linux/docker/scripts/install_ubuntu.sh:82:58: info: Double quote to prevent globbing and word splitting. (ShellCheck.SC2086)
#TODO: the old one(/usr/bin/pip3) should be uninstalled first. Because the one will be
#put at /usr/local/. Then there will be two pips.
/usr/bin/python${PYTHON_VER} -m pip install --upgrade --force-reinstall pip==19.0.3
Expand Down
7 changes: 2 additions & 5 deletions tools/ci_build/github/linux/docker/scripts/manylinux/install_centos.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,6 @@ if [ "$os_major_version" -gt 7 ]; then
PACKAGE_MANAGER="dnf"
$PACKAGE_MANAGER install -y which redhat-lsb-core expat-devel tar unzip zlib-devel make bzip2 bzip2-devel perl-IPC-Cmd openssl-devel wget
fi
if [ ! -f /etc/yum.repos.d/microsoft-prod.repo ]; then
rpm -Uvh https://packages.microsoft.com/config/centos/$os_major_version/packages-microsoft-prod.rpm
fi
# Install Java

# Install automatic documentation generation dependencies
$PACKAGE_MANAGER install -y msopenjdk-11 graphviz
$PACKAGE_MANAGER install -y graphviz
2 changes: 1 addition & 1 deletion tools/ci_build/github/linux/docker/scripts/manylinux/install_ubuntuos.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/bin/bash
set -ex

os_major_version=$(cat /etc/os-release | tr -dc '0-9.'|cut -d \. -f1)

Check warning on line 4 in tools/ci_build/github/linux/docker/scripts/manylinux/install_ubuntuos.sh

View workflow job for this annotation

GitHub Actions / Optional Lint 

[shellcheck] reported by reviewdog 🐶
Useless cat. Consider 'cmd < file | ..' or 'cmd file | ..' instead.

Raw Output:
./tools/ci_build/github/linux/docker/scripts/manylinux/install_ubuntuos.sh:4:24: info: Useless cat. Consider 'cmd < file | ..' or 'cmd file | ..' instead. (ShellCheck.SC2002)

apt-get update -y && apt-get upgrade -y
apt-get install -y software-properties-common
Expand All @@ -12,4 +12,4 @@
# Install Java
# Install automatic documentation generation dependencies
apt-get update
apt-get install -y openjdk-11-jdk graphviz
apt-get install -y openjdk-17-jdk graphviz
Loading