From c3ba3f7224e4de5db8685e9c1d51733e31c5698a Mon Sep 17 00:00:00 2001 From: Yuta Saito Date: Sat, 10 Aug 2024 10:10:05 +0000 Subject: [PATCH] Install newer ninja-build in the Amazon Linux 2 Dockerfile --- swift-ci/main/amazon-linux/2/Dockerfile | 5 +---- swift-ci/main/install-extra-packages.sh | 12 +++++++++++- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/swift-ci/main/amazon-linux/2/Dockerfile b/swift-ci/main/amazon-linux/2/Dockerfile index 1c6d68e..b636f24 100644 --- a/swift-ci/main/amazon-linux/2/Dockerfile +++ b/swift-ci/main/amazon-linux/2/Dockerfile @@ -40,9 +40,6 @@ RUN yum -y install \ wget \ which -# Install ninja-build to save build-time -RUN yum -y install ninja-build && ln -s /usr/bin/ninja-build /usr/bin/ninja - RUN mkdir -p /usr/local/lib/python3.7/site-packages/ RUN easy_install-3.7 six @@ -92,7 +89,7 @@ ENV PATH="${SWIFT_PREFIX}/usr/bin:${PATH}" COPY ./swift-ci/main/install-extra-packages.sh /tmp/install-extra-packages.sh -RUN /tmp/install-extra-packages.sh cmake sccache && rm /tmp/install-extra-packages.sh +RUN /tmp/install-extra-packages.sh cmake sccache ninja && rm /tmp/install-extra-packages.sh USER build-user diff --git a/swift-ci/main/install-extra-packages.sh b/swift-ci/main/install-extra-packages.sh index ca8c8ba..ab10e70 100755 --- a/swift-ci/main/install-extra-packages.sh +++ b/swift-ci/main/install-extra-packages.sh @@ -8,7 +8,8 @@ install_wasmtime() { install_cmake() { local version="3.29.7" - local workdir="$(mktemp -d)" + local workdir + workdir="$(mktemp -d)" curl -L -o "$workdir/install_cmake.sh" "https://github.com/Kitware/CMake/releases/download/v$version/cmake-$version-linux-$(uname -m).sh" chmod +x "$workdir/install_cmake.sh" "$workdir/install_cmake.sh" --skip-license --prefix="$PREFIX" @@ -26,6 +27,15 @@ install_sccache() { ln -sf "$PREFIX/sccache/sccache" "$PREFIX/bin/sccache" } +install_ninja() { + local version="v1.11.1" + local workdir + workdir="$(mktemp -d)" + curl -L "https://github.com/ninja-build/ninja/archive/refs/tags/$version.tar.gz" | tar xz --strip-component=1 + cmake -B "$workdir" -S . -DCMAKE_INSTALL_PREFIX="$PREFIX" + cmake --build "$workdir" --target install -- -j "$(nproc)" +} + # ./install-extra-packages.sh [package1] [package2] ... # Install packages into $PREFIX (default: /usr/local)