From df3c353400763f0a71aa13d67ccfbd8b1871e9d0 Mon Sep 17 00:00:00 2001 From: Naveen Tatikonda Date: Mon, 8 Jul 2024 16:34:11 -0500 Subject: [PATCH] Bump up cmake version to 3.26.4 (#4822) Signed-off-by: Naveen Tatikonda --- .github/workflows/python-tests.yml | 2 ++ docker/ci/config/windows-setup.ps1 | 4 ++-- .../current/build.al2.opensearch.x64.arm64.dockerfile | 2 +- .../build.almalinux8.opensearch.x64.arm64.ppc64le.dockerfile | 2 +- ...alinux8.opensearch-dashboards.x64.arm64.ppc64le.dockerfile | 2 +- .../test.almalinux8.systemd-base.x64.arm64.ppc64le.dockerfile | 2 +- .../test.ubuntu2004.systemd-base.x64.arm64.ppc64le.dockerfile | 2 +- 7 files changed, 9 insertions(+), 7 deletions(-) diff --git a/.github/workflows/python-tests.yml b/.github/workflows/python-tests.yml index e5e62fa461..9d7e5834a1 100644 --- a/.github/workflows/python-tests.yml +++ b/.github/workflows/python-tests.yml @@ -46,6 +46,8 @@ jobs: python-tests-linux: needs: Get-CI-Image-Tag runs-on: ubuntu-latest + env: + ACTIONS_ALLOW_USE_UNSECURE_NODE_VERSION: true container: # using the same image which is used by opensearch-build team to build the OpenSearch Distribution # this image tag is subject to change as more dependencies and updates will arrive over time diff --git a/docker/ci/config/windows-setup.ps1 b/docker/ci/config/windows-setup.ps1 index 45e2ab040f..38e35461a4 100644 --- a/docker/ci/config/windows-setup.ps1 +++ b/docker/ci/config/windows-setup.ps1 @@ -187,8 +187,8 @@ scoop install gh gh version # Install dev tools -# Lock to 3.23.3 -scoop install https://raw.githubusercontent.com/ScoopInstaller/Main/56eed69c3bf04110e306f77ad45cfc8c1c5bb9bc/bucket/cmake.json +# Lock to 3.26.4 +scoop install https://raw.githubusercontent.com/ScoopInstaller/Main/22a3d6e16c3688926f575eb80e3cc20286b8cf50/bucket/cmake.json cmake --version # Install zip diff --git a/docker/ci/dockerfiles/current/build.al2.opensearch.x64.arm64.dockerfile b/docker/ci/dockerfiles/current/build.al2.opensearch.x64.arm64.dockerfile index 34b23cf1ff..c9dd94704c 100644 --- a/docker/ci/dockerfiles/current/build.al2.opensearch.x64.arm64.dockerfile +++ b/docker/ci/dockerfiles/current/build.al2.opensearch.x64.arm64.dockerfile @@ -112,7 +112,7 @@ RUN git clone -b v0.3.27 --single-branch https://github.com/xianyi/OpenBLAS.git fi && \ make PREFIX=/usr/local install ENV LD_LIBRARY_PATH="/usr/local/lib:$LD_LIBRARY_PATH" -RUN pip3 install cmake==3.23.3 +RUN pip3 install cmake==3.26.4 # Change User USER $CONTAINER_USER diff --git a/docker/ci/dockerfiles/current/build.almalinux8.opensearch.x64.arm64.ppc64le.dockerfile b/docker/ci/dockerfiles/current/build.almalinux8.opensearch.x64.arm64.ppc64le.dockerfile index 498baa0e09..249fd308d4 100644 --- a/docker/ci/dockerfiles/current/build.almalinux8.opensearch.x64.arm64.ppc64le.dockerfile +++ b/docker/ci/dockerfiles/current/build.almalinux8.opensearch.x64.arm64.ppc64le.dockerfile @@ -86,7 +86,7 @@ RUN dnf install -y 'dnf-command(config-manager)' && \ dnf config-manager --set-enabled powertools && \ dnf install epel-release -y && dnf repolist && \ dnf install openblas-static lapack gcc-gfortran -y && dnf clean all -RUN pip3 install cmake==3.23.3 +RUN pip3 install cmake==3.26.4 # Upgrade gcc # The setup part is partially based on Austin Dewey's article: # https://austindewey.com/2019/03/26/enabling-software-collections-binaries-on-a-docker-image/ diff --git a/docker/ci/dockerfiles/current/test.almalinux8.opensearch-dashboards.x64.arm64.ppc64le.dockerfile b/docker/ci/dockerfiles/current/test.almalinux8.opensearch-dashboards.x64.arm64.ppc64le.dockerfile index 0b83803154..45241f0ebb 100644 --- a/docker/ci/dockerfiles/current/test.almalinux8.opensearch-dashboards.x64.arm64.ppc64le.dockerfile +++ b/docker/ci/dockerfiles/current/test.almalinux8.opensearch-dashboards.x64.arm64.ppc64le.dockerfile @@ -130,7 +130,7 @@ RUN update-alternatives --set python /usr/bin/python3.9 && \ # Add other dependencies RUN dnf install -y epel-release && dnf clean all && dnf install -y jq && dnf clean all && rm -rf /var/cache/dnf/* && \ - pip3 install cmake==3.23.3 + pip3 install cmake==3.26.4 # Tools setup COPY --chown=0:0 config/yq-setup.sh config/gh-setup.sh /tmp/ diff --git a/docker/ci/dockerfiles/current/test.almalinux8.systemd-base.x64.arm64.ppc64le.dockerfile b/docker/ci/dockerfiles/current/test.almalinux8.systemd-base.x64.arm64.ppc64le.dockerfile index 49b04dd4ac..0f78781e35 100644 --- a/docker/ci/dockerfiles/current/test.almalinux8.systemd-base.x64.arm64.ppc64le.dockerfile +++ b/docker/ci/dockerfiles/current/test.almalinux8.systemd-base.x64.arm64.ppc64le.dockerfile @@ -152,7 +152,7 @@ RUN update-alternatives --set python /usr/bin/python3.9 && \ # Add other dependencies RUN dnf install -y epel-release && dnf clean all && dnf install -y jq && dnf clean all && \ - pip3 install cmake==3.23.3 + pip3 install cmake==3.26.4 # We use the version test to check if packages installed correctly # And get added to the PATH diff --git a/docker/ci/dockerfiles/current/test.ubuntu2004.systemd-base.x64.arm64.ppc64le.dockerfile b/docker/ci/dockerfiles/current/test.ubuntu2004.systemd-base.x64.arm64.ppc64le.dockerfile index dd80f0719f..fdcf66c5b9 100644 --- a/docker/ci/dockerfiles/current/test.ubuntu2004.systemd-base.x64.arm64.ppc64le.dockerfile +++ b/docker/ci/dockerfiles/current/test.ubuntu2004.systemd-base.x64.arm64.ppc64le.dockerfile @@ -114,7 +114,7 @@ RUN apt-get update -y && apt-get upgrade -y && apt-get install -y curl git gnupg # Install pip packages RUN curl -SL https://bootstrap.pypa.io/get-pip.py | python && \ pip3 install pip==23.1.2 && pip3 install pipenv==2023.6.12 awscli==1.32.17 && \ - pip3 install cmake==3.23.3 + pip3 install cmake==3.26.4 # Create user group RUN apt-get install -y sudo && \