Fix

apache · Oct 17, 2024 · 8eae965 · 8eae965
1 parent f7a0092
commit 8eae965
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 3 deletions.
diff --git a/.github/workflows/velox_weekly.yml b/.github/workflows/velox_weekly.yml
@@ -49,13 +49,14 @@ jobs:
           yum install -y epel-release sudo dnf
           if [ "${{ matrix.os }}" = "centos:7" ]; then
             yum install -y centos-release-scl
-            source /opt/rh/devtoolset-11/enable
             rm /etc/yum.repos.d/CentOS-SCLo-scl.repo -f
             sed -i \
             -e 's/^mirrorlist/#mirrorlist/' \
             -e 's/^#baseurl/baseurl/' \
             -e 's/mirror\.centos\.org/vault.centos.org/' \
             /etc/yum.repos.d/CentOS-SCLo-scl-rh.repo
+            yum install -y devtoolset-11
+            source /opt/rh/devtoolset-11/enable
           elif [ "${{ matrix.os }}" = "quay.io/centos/centos:stream9" ]; then
             dnf install -y --setopt=install_weak_deps=False gcc-toolset-12
             source /opt/rh/gcc-toolset-12/enable || exit 1
@@ -89,8 +90,11 @@ jobs:
           export DEBIAN_FRONTEND=noninteractive
           apt-get update && apt-get install -y sudo maven wget git
           if [ "${{ matrix.os }}" = "centos:7" ]; then
-            sudo apt-get install software-properties-common
+            sudo apt install software-properties-common
             sudo add-apt-repository ppa:ubuntu-toolchain-r/test
+            sudo apt update && sudo apt install -y gcc-11 g++-11
+            sudo ln -sf /usr/bin/gcc-11 /usr/bin/gcc
+            sudo ln -sf /usr/bin/g++-11 /usr/bin/g++
           fi
           sudo apt-get install -y openjdk-8-jdk
           export JAVA_HOME=/usr/lib/jvm/java-8-openjdk-amd64

diff --git a/dev/ci-velox-buildshared-centos-8.sh b/dev/ci-velox-buildshared-centos-8.sh
@@ -2,6 +2,8 @@
 
 set -e
 
+# TODO: will be removed after docker is updated.
+dnf install -y --setopt=install_weak_deps=False gcc-toolset-11
 source /opt/rh/gcc-toolset-11/enable
 ./dev/builddeps-veloxbe.sh --run_setup_script=OFF --build_arrow=OFF --enable_ep_cache=OFF --build_tests=ON \
     --build_examples=ON --build_benchmarks=ON
diff --git a/dev/ci-velox-buildstatic-centos-7.sh b/dev/ci-velox-buildstatic-centos-7.sh
@@ -2,6 +2,8 @@
 
 set -e
 
+# TODO: will be removed after docker is updated.
+sudo yum install -y devtoolset-11
 source /opt/rh/devtoolset-11/enable
 export NUM_THREADS=4
 ./dev/builddeps-veloxbe.sh --enable_vcpkg=ON --build_arrow=OFF --build_tests=OFF --build_benchmarks=OFF \

diff --git a/dev/docker/Dockerfile.centos7-static-build b/dev/docker/Dockerfile.centos7-static-build
@@ -11,7 +11,7 @@ RUN sed -i \
        -e 's/mirror\.centos\.org/vault.centos.org/' \
        /etc/yum.repos.d/CentOS-SCLo-scl-rh.repo
 
-RUN yum install -y git patch wget sudo java-1.8.0-openjdk-devel ccache
+RUN yum install -y git patch wget sudo java-1.8.0-openjdk-devel ccache devtoolset-11
 
 RUN git clone --depth=1 https://github.com/apache/incubator-gluten /opt/gluten