Bug 1324492 - Upgrade CMake to 3.7.1 in the desktop-build image; r=dustin
☠☠ backed out by 9123c3b05739 ☠ ☠
authorEhsan Akhgari <ehsan@mozilla.com>
Sun, 18 Dec 2016 11:58:17 -0500
changeset 327667 fd09b9651dc64078fc6438f54c7bb83368a54731
parent 327666 f85df7c929978dcafbca01d614d9289675e29369
child 327668 263b1b07c2ace4f786263c98c96d06affc8c7ec3
push id85244
push usereakhgari@mozilla.com
push dateFri, 30 Dec 2016 16:41:13 +0000
treeherdermozilla-inbound@263b1b07c2ac [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersdustin
bugs1324492
milestone53.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 1324492 - Upgrade CMake to 3.7.1 in the desktop-build image; r=dustin Newer versions of LLVM require CMake 3.4, so we may as well upgrade to the latest version.
taskcluster/docker/centos6-build-upd/Dockerfile
taskcluster/docker/centos6-build-upd/VERSION
taskcluster/docker/centos6-build/VERSION
taskcluster/docker/centos6-build/system-setup.sh
taskcluster/docker/desktop-build/Dockerfile
--- a/taskcluster/docker/centos6-build-upd/Dockerfile
+++ b/taskcluster/docker/centos6-build-upd/Dockerfile
@@ -1,9 +1,9 @@
-FROM          taskcluster/centos6-build:0.1.6
+FROM          taskcluster/centos6-build:0.1.7
 MAINTAINER    Dustin J. Mitchell <dustin@mozilla.com>
 
 ### update to latest from upstream repositories
 # if this becomes a long list of packages, consider bumping the
 # centos6-build version
 RUN yum update -y
 
 # Set a default command useful for debugging
--- a/taskcluster/docker/centos6-build-upd/VERSION
+++ b/taskcluster/docker/centos6-build-upd/VERSION
@@ -1,1 +1,1 @@
-0.1.6.20160329195300
+0.1.7.20161229150900
--- a/taskcluster/docker/centos6-build/VERSION
+++ b/taskcluster/docker/centos6-build/VERSION
@@ -1,1 +1,1 @@
-0.1.6
+0.1.7
--- a/taskcluster/docker/centos6-build/system-setup.sh
+++ b/taskcluster/docker/centos6-build/system-setup.sh
@@ -263,17 +263,16 @@ install npm
 # enough X to run `make check` and do a PGO build
 install Xvfb
 install xvinfo
 
 # required for building OS X tools
 install patch
 install libuuid-devel
 install openssl-static
-install cmake
 install subversion
 run
 EOF
 
 BUILD=/root/build
 mkdir $BUILD
 
 # for the builds below, there's no sense using ccache
@@ -424,16 +423,32 @@ virtualenv==13.1.2
 # sha256: wJnELXTi1SC2HdNyzZlrD6dgXAZheDT9exPHm5qaWzA
 mercurial==3.7.3
 EOF
 peep install -r requirements.txt
 
 # TC-VCS
 npm install -g taskcluster-vcs@2.3.18
 
+# CMake 3.7.1
+cd $BUILD
+tooltool_fetch <<'EOF'
+[
+{
+    "size": 7361172,
+    "digest": "0539d70ce3ac77042a45d638443b09fbf368e253622db980bc6fb15988743eacd031ab850a45c821ec3e9f0f5f886b9c9cb0668aeda184cd457b78abbfe7b629",
+    "algorithm": "sha512",
+    "filename": "cmake-3.7.1.tar.gz",
+    "unpack": true
+}
+]
+EOF
+cd cmake-3.7.1
+./bootstrap && make install
+
 # Ninja
 cd $BUILD
 tooltool_fetch <<'EOF'
 [
 {
     "size": 174501,
     "digest": "551a9e14b95c2d2ddad6bee0f939a45614cce86719748dc580192dd122f3671e3d95fd6a6fb3facb2d314ba100d61a004af4df77f59df119b1b95c6fe8c38875",
     "algorithm": "sha512",
--- a/taskcluster/docker/desktop-build/Dockerfile
+++ b/taskcluster/docker/desktop-build/Dockerfile
@@ -1,10 +1,10 @@
 # TODO remove VOLUME below when the base image is updated next.
-FROM          taskcluster/centos6-build-upd:0.1.6.20160329195300
+FROM          taskcluster/centos6-build-upd:0.1.7.20161229150900
 MAINTAINER    Dustin J. Mitchell <dustin@mozilla.com>
 
 # TODO remove when base image is updated
 VOLUME /home/worker/workspace
 VOLUME /home/worker/tooltool-cache
 
 # Add build scripts; these are the entry points from the taskcluster worker, and
 # operate on environment variables