Build ninja instead of downloading a pre-built binary

edgedb · Oct 9, 2024 · 1de3657 · 1de3657
1 parent 1d9f29f
commit 1de3657
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 12 deletions.
diff --git a/integration/linux/build/Dockerfile-linux.template b/integration/linux/build/Dockerfile-linux.template
@@ -221,10 +221,13 @@ RUN set -ex \
 		https://go.dev/dl/go${GO_VERSION}.linux-${GO_ARCH}.tar.gz -o /tmp/go.tgz \
 	&& tar -C /usr/local -xzf /tmp/go.tgz \
 	&& rm /tmp/go.tgz \
-	&& curl -fsSL "https://github.com/ninja-build/ninja/releases/download/v${NINJA_VERSION}/ninja-linux${NINJA_ARCH:+-$NINJA_ARCH}.zip" -o "ninja.zip" \
-	&& unzip ninja.zip -d /usr/local/bin \
-	&& rm -f ninja.zip \
-	&& chmod +x /usr/local/bin/ninja \
+	&& curl -fsSL "https://github.com/ninja-build/ninja/archive/refs/tags/v${NINJA_VERSION}.tar.gz" -o /tmp/ninja.tar.gz \
+	&& mkdir -p /usr/src/ninja \
+	&& tar -xzC /usr/src/ninja --strip-components=1 -f /tmp/ninja.tar.gz \
+	&& rm /tmp/ninja.tar.gz \
+	&& cd /usr/src/ninja \
+	&& ./configure.py --bootstrap --verbose \
+	&& cp -a ./ninja /usr/local/bin/ninja \
 	&& curl -fsSLO --compressed "https://github.com/Kitware/CMake/releases/download/v$CMAKE_VERSION/cmake-$CMAKE_VERSION${CMAKE_ARCH:+-linux-$CMAKE_ARCH}.tar.gz" \
 	&& curl -fsSLO --compressed "https://github.com/Kitware/CMake/releases/download/v$CMAKE_VERSION/cmake-$CMAKE_VERSION-SHA-256.txt" \
 	&& curl -fsSLO --compressed "https://github.com/Kitware/CMake/releases/download/v$CMAKE_VERSION/cmake-$CMAKE_VERSION-SHA-256.txt.asc" \

diff --git a/integration/linux/build/linux-aarch64/Dockerfile b/integration/linux/build/linux-aarch64/Dockerfile
diff --git a/integration/linux/build/linux-x86_64/Dockerfile b/integration/linux/build/linux-x86_64/Dockerfile