Bug 1213627 - Add ninja to the desktop-build image to support building clang 3.7; r=dustin
authorEhsan Akhgari <ehsan@mozilla.com>
Sat, 10 Oct 2015 21:47:13 -0400
changeset 300942 7b9a08825f7db4197755a6ebb51f9a7f82c5167b
parent 300941 5b5b1921c0d6cb0d6251024b961ab931109f8439
child 300943 6d7a8e19086c69e2f01d497e6d95dcabc0fa2c5f
push id5392
push userraliiev@mozilla.com
push dateMon, 14 Dec 2015 20:08:23 +0000
treeherdermozilla-beta@16ce8562a975 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersdustin
bugs1213627
milestone44.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1213627 - Add ninja to the desktop-build image to support building clang 3.7; r=dustin
testing/docker/centos6-build-upd/VERSION
testing/docker/centos6-build/VERSION
testing/docker/centos6-build/system-setup.sh
testing/docker/desktop-build/VERSION
--- a/testing/docker/centos6-build-upd/VERSION
+++ b/testing/docker/centos6-build-upd/VERSION
@@ -1,1 +1,1 @@
-20150930093701
+20151013094100
--- a/testing/docker/centos6-build/VERSION
+++ b/testing/docker/centos6-build/VERSION
@@ -1,1 +1,1 @@
-0.1.1
+0.1.2
--- a/testing/docker/centos6-build/system-setup.sh
+++ b/testing/docker/centos6-build/system-setup.sh
@@ -420,16 +420,35 @@ virtualenv==13.1.2
 # sha256: tQ9peOfTn-DLKY-j-j6c5B0jVnIdFV5SiPnFfl8T6ac
 mercurial==3.5
 EOF
 peep install -r requirements.txt
 
 # TC-VCS
 npm install -g taskcluster-vcs@2.3.12
 
+# Ninja
+cd $BUILD
+tooltool_fetch <<'EOF'
+[
+{
+    "size": 174501,
+    "digest": "551a9e14b95c2d2ddad6bee0f939a45614cce86719748dc580192dd122f3671e3d95fd6a6fb3facb2d314ba100d61a004af4df77f59df119b1b95c6fe8c38875",
+    "algorithm": "sha512",
+    "filename": "ninja-1.6.0.tar.gz",
+    "unpack": true
+}
+]
+EOF
+cd ninja-1.6.0
+./configure.py --bootstrap
+cp ninja /usr/local/bin/ninja
+# Old versions of Cmake can only find ninja in this location!
+ln -s /usr/local/bin/ninja /usr/local/bin/ninja-build
+
 # note that TC will replace workspace with a cache mount; there's no sense
 # creating anything inside there
 mkdir -p /home/worker/workspace
 chown worker:worker /home/worker/workspace
 
 # /builds is *not* replaced with a mount in the docker container. The worker
 # user writes to lots of subdirectories, though, so it's owned by that user
 mkdir -p /builds
--- a/testing/docker/desktop-build/VERSION
+++ b/testing/docker/desktop-build/VERSION
@@ -1,1 +1,1 @@
-0.1.10
+0.1.11