Skip to content

Commit 2e7ea7b

Browse files
committed
force install c-ares from source
1 parent afa12c3 commit 2e7ea7b

File tree

3 files changed

+13
-5
lines changed

3 files changed

+13
-5
lines changed

.github/workflows/release_packages.yml

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,10 @@ jobs:
5555
runs-on: [self-hosted, Linux, "${{ matrix.arch }}"]
5656
container:
5757
image: registry-1.docker.io/dashinfer/${{ matrix.image }}
58+
env:
59+
# force use node16 instead of node20
60+
# otherwise it may cause GLIBCXX_2.27 not found
61+
ACTIONS_ALLOW_USE_UNSECURE_NODE_VERSION: true
5862
defaults:
5963
run:
6064
shell: bash -l {0}
@@ -76,7 +80,7 @@ jobs:
7680
source /opt/rh/devtoolset-7/enable
7781
source activate ds_py
7882
AS_RELEASE_VERSION=$VERSION_NUMBER \
79-
AS_PLATFORM="x86" \
83+
AS_PLATFORM=$( [[ "${{ matrix.arch }}" = "X64" ]] && echo "x86" || echo "armclang" ) \
8084
AS_BUILD_PACKAGE=ON \
8185
bash build.sh
8286
@@ -100,6 +104,10 @@ jobs:
100104
runs-on: [self-hosted, Linux, "${{ matrix.arch }}"]
101105
container:
102106
image: registry-1.docker.io/dashinfer/${{ matrix.image }}
107+
env:
108+
# force use node16 instead of node20
109+
# otherwise it may cause GLIBCXX_2.27 not found
110+
ACTIONS_ALLOW_USE_UNSECURE_NODE_VERSION: true
103111
steps:
104112
- name: Check out code
105113
uses: actions/checkout@v3

build.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,15 +39,15 @@ if [ ! -d "./build" ]; then
3939
else
4040
conan profile update settings.compiler.libcxx=libstdc++ cxx11abi
4141
fi
42-
conan install ../conan/conanfile_arm.txt -pr cxx11abi -b missing -b protobuf -b gtest -b openssl -b grpc -b glog -b abseil
42+
conan install ../conan/conanfile_arm.txt -pr cxx11abi -b missing -b protobuf -b gtest -b openssl -b grpc -b glog -b abseil -b c-ares
4343
else
4444
conan profile new cxx11abi --detect --force
4545
if [ "$enable_glibcxx11_abi" == "ON" ]; then
4646
conan profile update settings.compiler.libcxx=libstdc++11 cxx11abi
4747
else
4848
conan profile update settings.compiler.libcxx=libstdc++ cxx11abi
4949
fi
50-
conan install ../conan/conanfile.txt -pr cxx11abi -b missing -b protobuf -b gtest -b openssl -b grpc -b glog -b abseil
50+
conan install ../conan/conanfile.txt -pr cxx11abi -b missing -b protobuf -b gtest -b openssl -b grpc -b glog -b abseil -b c-ares
5151
fi
5252
cd ../
5353
fi

python/setup.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -102,13 +102,13 @@ def os_script_exec(cmd: str):
102102
"cp -f {{cwd_parent}}/conan/conanprofile_armclang.aarch64 ~/.conan/profiles/cxx11abi\n" +
103103
"cp -r {{cwd_parent}}/conan/settings_arm.yml ~/.conan/settings.yml\n" +
104104
"conan profile update settings.compiler.libcxx={{libcxx_setting}} cxx11abi\n" +
105-
"conan install {{cwd_parent}}/conan/conanfile_arm.txt -pr cxx11abi -b missing -b protobuf -b gtest -b openssl -b grpc -b glog -b abseil"
105+
"conan install {{cwd_parent}}/conan/conanfile_arm.txt -pr cxx11abi -b missing -b protobuf -b gtest -b openssl -b grpc -b glog -b abseil -b c-ares"
106106
).render(libcxx_setting=libcxx_setting, cwd_parent=str(cwd.parent))
107107

108108
conan_install_other = Template(
109109
"conan profile new cxx11abi --detect --force\n" +
110110
"conan profile update settings.compiler.libcxx={{libcxx_setting}} cxx11abi\n" +
111-
"conan install {{cwd_parent}}/conan/conanfile.txt -pr cxx11abi -b missing -b protobuf -b gtest -b openssl -b grpc -b glog -b abseil"
111+
"conan install {{cwd_parent}}/conan/conanfile.txt -pr cxx11abi -b missing -b protobuf -b gtest -b openssl -b grpc -b glog -b abseil -b c-ares"
112112
).render(libcxx_setting=libcxx_setting, cwd_parent=str(cwd.parent))
113113

114114
conan_install_cmd = conan_install_other

0 commit comments

Comments
 (0)