Skip to content

ci: install glib2 and update ninja to version 1.8.2. #8033

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
PiotrSikora wants to merge 1 commit into from
Closed

ci: install glib2 and update ninja to version 1.8.2. #8033

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions ci/build_container/build_container_centos.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,10 @@ set -e
yum install -y centos-release-scl epel-release
yum update -y
yum install -y devtoolset-7-gcc devtoolset-7-gcc-c++ devtoolset-7-binutils java-1.8.0-openjdk-headless rsync \
rh-git218 wget unzip which make cmake3 patch ninja-build devtoolset-7-libatomic-devel openssl python27 \
libtool autoconf tcpdump
rh-git218 wget unzip which make cmake3 patch devtoolset-7-libatomic-devel openssl python27 \
libtool autoconf tcpdump glib2-devel

ln -s /usr/bin/cmake3 /usr/bin/cmake
ln -s /usr/bin/ninja-build /usr/bin/ninja

# SLES 11 has older glibc than CentOS 7, so pre-built binary for it works on CentOS 7
LLVM_VERSION=8.0.0
Expand Down
8 changes: 8 additions & 0 deletions ci/build_container/build_container_common.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,12 @@ if [[ "$(uname -m)" == "x86_64" ]]; then
curl --location --output /usr/local/bin/bazel https://github.com/bazelbuild/bazelisk/releases/download/v${VERSION}/bazelisk-linux-amd64 \
&& echo "$SHA256 /usr/local/bin/bazel" | sha256sum --check \
&& chmod +x /usr/local/bin/bazel

# ninja
VERSION=1.8.2
Copy link
Copy Markdown
Contributor

@moderation moderation Aug 24, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

1.8.2 is from September 2017. Any reason your not using the latest Ninja release 1.9.0? https://github.com/ninja-build/ninja/releases/tag/v1.9.0

Copy link
Copy Markdown
Contributor Author

@PiotrSikora PiotrSikora Aug 24, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

As far as I remember, v1.9.0 was built using newer glibc, and it won't load on CentOS.

SHA256=d2fea9ff33b3ef353161ed906f260d565ca55b8ca0568fa07b1d2cab90a84a07
curl -sLo ninja-"$VERSION".zip https://github.com/ninja-build/ninja/releases/download/v"$VERSION"/ninja-linux.zip \
&& echo "$SHA256" ninja-"$VERSION".zip | sha256sum --check \
&& unzip ninja-"$VERSION".zip \
&& mv ninja /usr/bin
fi
2 changes: 1 addition & 1 deletion ci/build_container/build_container_ubuntu.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ update-alternatives --config gcc
update-alternatives --config g++

apt-get install -y --no-install-recommends curl wget make cmake git python python-pip python-setuptools python3 python3-pip \
unzip bc libtool ninja-build automake zip time gdb strace tshark tcpdump patch xz-utils rsync ssh-client
unzip bc libtool automake zip time gdb strace tshark tcpdump patch xz-utils rsync ssh-client libglib2.0-dev

# clang 8.
case $ARCH in
Expand Down