From 0afb29d7c1fb5127303951fc0457635cf70b246f Mon Sep 17 00:00:00 2001 From: PHILO-HE Date: Thu, 17 Oct 2024 20:50:24 +0800 Subject: [PATCH] Fix --- .github/workflows/velox_weekly.yml | 4 +++- dev/ci-velox-buildshared-centos-8.sh | 2 ++ dev/ci-velox-buildstatic-centos-7.sh | 2 ++ 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/.github/workflows/velox_weekly.yml b/.github/workflows/velox_weekly.yml index d0d1b27ebcd14..99521f1299b62 100644 --- a/.github/workflows/velox_weekly.yml +++ b/.github/workflows/velox_weekly.yml @@ -49,6 +49,7 @@ jobs: yum install -y epel-release sudo dnf if [ "${{ matrix.os }}" = "centos:7" ]; then yum install -y centos-release-scl + yum install -y devtoolset-11 source /opt/rh/devtoolset-11/enable rm /etc/yum.repos.d/CentOS-SCLo-scl.repo -f sed -i \ @@ -89,8 +90,9 @@ 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 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 index ff9a62b798b5a..f295632ffe35c 100755 --- 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 index 6895891a98e98..76bd33d7ffa77 100755 --- 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 \