diff --git a/.github/workflows/greenplum-abi-tests.yml b/.github/workflows/greenplum-abi-tests.yml index 18a32b70754d..796f68d9577b 100644 --- a/.github/workflows/greenplum-abi-tests.yml +++ b/.github/workflows/greenplum-abi-tests.yml @@ -93,15 +93,6 @@ jobs: sudo apt install -y libuv1-dev libpam0g-dev libldap-dev libipc-run-perl abi-dumper sudo ln -fs python2 /usr/bin/python - - name: Build libxerces 3.1.2 - run: | - wget https://github.com/arenadata/gp-xerces/archive/refs/tags/v3.1.2-p1.tar.gz - tar -xzf v3.1.2-p1.tar.gz - pushd gp-xerces-3.1.2-p1 - ./configure - make -j`nproc` && sudo make install - popd - - name: Build Greenplum run: | ## TODO: Since abi-dumper requires debug info and it's hard to inject CFLAGS via the script for diff --git a/README.ubuntu.bash b/README.ubuntu.bash index a915c4068f3f..b740a108eb8d 100755 --- a/README.ubuntu.bash +++ b/README.ubuntu.bash @@ -24,6 +24,7 @@ apt-get install -y \ libssl-dev \ libtool \ libuv1-dev \ + libxerces-c-dev \ libxml2-dev \ libxslt-dev \ libyaml-dev \ diff --git a/arenadata/Dockerfile.ubuntu b/arenadata/Dockerfile.ubuntu index f1fa88e21f48..bbd743c93448 100644 --- a/arenadata/Dockerfile.ubuntu +++ b/arenadata/Dockerfile.ubuntu @@ -2,15 +2,13 @@ FROM ubuntu:22.04 as base ARG sigar=https://downloads.adsw.io/ADB/6.27.1_arenadata56/ubuntu/22.04/community/x86_64/packages/sigar_1.6.5-3304%2Bgite8961a6_all.deb ARG sigar_headers=https://downloads.adsw.io/ADB/6.27.1_arenadata56/ubuntu/22.04/community/x86_64/packages/sigar-headers_1.6.5-3304%2Bgite8961a6_all.deb -ARG libxerces=https://downloads.adsw.io/ADB/6.27.1_arenadata56/ubuntu/22.04/community/x86_64/packages/libxerces-c31_3.1.2-3304_amd64.deb -ARG libxerces_dev=https://downloads.adsw.io/ADB/6.27.1_arenadata56/ubuntu/22.04/community/x86_64/packages/libxerces-c31-dev_3.1.2-3304_amd64.deb ARG adb_python3=https://downloads.adsw.io/ADB/6.27.1_arenadata56/ubuntu/22.04/community/x86_64/packages/adb6-python_3.9.18-3304_all.deb COPY README.ubuntu.bash ./ RUN set -eux; \ ./README.ubuntu.bash; \ rm README.ubuntu.bash; \ - wget $sigar $sigar_headers $libxerces $libxerces_dev $adb_python3; \ + wget $sigar $sigar_headers $adb_python3; \ apt install -y ./*.deb; \ rm ./*.deb; \ ln -s python2 /usr/bin/python; \