From b73005b7b7f9bfda2a48a7c5516dbc6481a06dcc Mon Sep 17 00:00:00 2001 From: Prabhu Subramanian Date: Wed, 22 May 2024 05:45:18 +0100 Subject: [PATCH 1/4] Fix ppc64 build issue Signed-off-by: Prabhu Subramanian --- ci/Dockerfile-ppc64 | 1 - 1 file changed, 1 deletion(-) diff --git a/ci/Dockerfile-ppc64 b/ci/Dockerfile-ppc64 index c99bb2f38..519dfc952 100644 --- a/ci/Dockerfile-ppc64 +++ b/ci/Dockerfile-ppc64 @@ -51,7 +51,6 @@ RUN set -e; \ *) echo >&2 "error: unsupported architecture: '$ARCH_NAME'"; exit 1 ;; \ esac; \ echo -e "[nodejs]\nname=nodejs\nstream=20\nprofiles=\nstate=enabled\n" > /etc/dnf/modules.d/nodejs.module \ - && microdnf module enable php ruby -y \ && microdnf install -y php php-curl php-zip php-bcmath php-json php-pear php-mbstring php-devel make gcc git-core \ python${PYTHON_VERSION} python${PYTHON_VERSION}-devel python${PYTHON_VERSION}-pip ruby ruby-devel java-21-openjdk-headless \ pcre2 which tar gzip zip unzip sudo nodejs ncurses sqlite-devel \ From ff868588b44d0469862a1eb263ee9793e36b986e Mon Sep 17 00:00:00 2001 From: Prabhu Subramanian Date: Wed, 22 May 2024 05:56:24 +0100 Subject: [PATCH 2/4] Fix ppc64 build issue Signed-off-by: Prabhu Subramanian --- ci/Dockerfile-ppc64 | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ci/Dockerfile-ppc64 b/ci/Dockerfile-ppc64 index 519dfc952..c9cd716f4 100644 --- a/ci/Dockerfile-ppc64 +++ b/ci/Dockerfile-ppc64 @@ -55,10 +55,10 @@ RUN set -e; \ python${PYTHON_VERSION} python${PYTHON_VERSION}-devel python${PYTHON_VERSION}-pip ruby ruby-devel java-21-openjdk-headless \ pcre2 which tar gzip zip unzip sudo nodejs ncurses sqlite-devel \ && alternatives --install /usr/bin/python3 python /usr/bin/python${PYTHON_VERSION} 1 \ - && python3${PYTHON_VERSION} --version \ + && python${PYTHON_VERSION} --version \ && source "$HOME/.cargo/env" \ - && python3${PYTHON_VERSION} -m pip install --upgrade pip virtualenv \ - && python3${PYTHON_VERSION} -m pip install --user pipenv poetry \ + && python${PYTHON_VERSION} -m pip install --upgrade pip virtualenv \ + && python${PYTHON_VERSION} -m pip install --user pipenv poetry \ && curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y \ && cargo --version \ && rustc --version \ From c5edca6ce4dd24d4a908bb70d0f31f3c315f2354 Mon Sep 17 00:00:00 2001 From: Prabhu Subramanian Date: Wed, 22 May 2024 06:03:50 +0100 Subject: [PATCH 3/4] Fix ppc64 build issue Signed-off-by: Prabhu Subramanian --- ci/Dockerfile-ppc64 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ci/Dockerfile-ppc64 b/ci/Dockerfile-ppc64 index c9cd716f4..88a4f5f0f 100644 --- a/ci/Dockerfile-ppc64 +++ b/ci/Dockerfile-ppc64 @@ -30,7 +30,7 @@ ENV GOPATH=/opt/app-root/go \ PYTHONIOENCODING="utf-8" \ COMPOSER_ALLOW_SUPERUSER=1 \ ANDROID_HOME=/opt/android-sdk-linux -ENV PATH=${PATH}:${JAVA_HOME}/bin:${MAVEN_HOME}/bin:${GRADLE_HOME}/bin:${SBT_HOME}/bin:${GOPATH}/bin:/usr/local/go/bin:/usr/local/bin/:/root/.local/bin:${ANDROID_HOME}/cmdline-tools/latest/bin:${ANDROID_HOME}/tools:${ANDROID_HOME}/tools/bin:${ANDROID_HOME}/platform-tools:/root/.cargo/bin: +ENV PATH=${PATH}:${JAVA_HOME}/bin:${MAVEN_HOME}/bin:${GRADLE_HOME}/bin:${SBT_HOME}/bin:${GOPATH}/bin:/usr/local/go/bin:/usr/local/bin/:/root/.local/bin:${ANDROID_HOME}/cmdline-tools/latest/bin:${ANDROID_HOME}/tools:${ANDROID_HOME}/tools/bin:${ANDROID_HOME}/platform-tools:/${HOME}/.cargo/bin: RUN set -e; \ ARCH_NAME="$(rpm --eval '%{_arch}')"; \ @@ -56,10 +56,10 @@ RUN set -e; \ pcre2 which tar gzip zip unzip sudo nodejs ncurses sqlite-devel \ && alternatives --install /usr/bin/python3 python /usr/bin/python${PYTHON_VERSION} 1 \ && python${PYTHON_VERSION} --version \ - && source "$HOME/.cargo/env" \ && python${PYTHON_VERSION} -m pip install --upgrade pip virtualenv \ && python${PYTHON_VERSION} -m pip install --user pipenv poetry \ && curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y \ + && source "$HOME/.cargo/env" \ && cargo --version \ && rustc --version \ && curl -s "https://get.sdkman.io" | bash \ From ee1ef5bd9b95f29e39ac4924948cc0000729b5d2 Mon Sep 17 00:00:00 2001 From: Prabhu Subramanian Date: Wed, 22 May 2024 06:17:08 +0100 Subject: [PATCH 4/4] Fix ppc64 build issue Signed-off-by: Prabhu Subramanian --- ci/Dockerfile-ppc64 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ci/Dockerfile-ppc64 b/ci/Dockerfile-ppc64 index 88a4f5f0f..494530413 100644 --- a/ci/Dockerfile-ppc64 +++ b/ci/Dockerfile-ppc64 @@ -56,12 +56,12 @@ RUN set -e; \ pcre2 which tar gzip zip unzip sudo nodejs ncurses sqlite-devel \ && alternatives --install /usr/bin/python3 python /usr/bin/python${PYTHON_VERSION} 1 \ && python${PYTHON_VERSION} --version \ - && python${PYTHON_VERSION} -m pip install --upgrade pip virtualenv \ - && python${PYTHON_VERSION} -m pip install --user pipenv poetry \ && curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y \ && source "$HOME/.cargo/env" \ && cargo --version \ && rustc --version \ + && python${PYTHON_VERSION} -m pip install --upgrade pip virtualenv \ + && python${PYTHON_VERSION} -m pip install --user pipenv poetry \ && curl -s "https://get.sdkman.io" | bash \ && source "$HOME/.sdkman/bin/sdkman-init.sh" \ && echo -e "sdkman_auto_answer=true\nsdkman_selfupdate_feature=false\nsdkman_auto_env=true" >> $HOME/.sdkman/etc/config \