From 1aecb955a00a920c8fa386c29d83d55c149c0b22 Mon Sep 17 00:00:00 2001
From: Josh Matthews <josh@joshmatthews.net>
Date: Fri, 8 Dec 2017 12:12:53 -0500
Subject: [PATCH] Make rustup update when specific version not present.

---
 servo-build-dependencies/ci-map.jinja |  6 ++++++
 servo-build-dependencies/ci.sls       | 22 ++++++++++++++++++++--
 servo-build-dependencies/init.sls     |  8 --------
 3 files changed, 26 insertions(+), 10 deletions(-)

diff --git a/servo-build-dependencies/ci-map.jinja b/servo-build-dependencies/ci-map.jinja
index 92ef466b..fac537f6 100644
--- a/servo-build-dependencies/ci-map.jinja
+++ b/servo-build-dependencies/ci-map.jinja
@@ -1,3 +1,9 @@
+{%
+  set rustup = {
+    'version': 'rustup 1.7.0 (813f7b7a8 2017-10-30)'
+  }
+%}
+
 {%
   set sccache = salt['grains.filter_by']({
       'defaults': {
diff --git a/servo-build-dependencies/ci.sls b/servo-build-dependencies/ci.sls
index 29c1d359..3a7f35a3 100644
--- a/servo-build-dependencies/ci.sls
+++ b/servo-build-dependencies/ci.sls
@@ -1,5 +1,5 @@
-{% from 'common/map.jinja' import root %}
-{% from tpldir ~ '/ci-map.jinja' import sccache %}
+{% from 'common/map.jinja' import root, common %}
+{% from tpldir ~ '/ci-map.jinja' import sccache, rustup %}
 
 sccache:
   file.managed:
@@ -12,3 +12,21 @@ sccache:
     - mode: 755
     {% endif %}
     - makedirs: True
+
+rustup-update:
+  cmd.run:
+    - name: rustup self update
+    - runas: servo
+    - unless: rustup --version | grep '{{ rustup.version }}'
+    - require:
+      - rustup-install
+
+rustup-install:
+  cmd.run:
+    - name: |
+        curl https://sh.rustup.rs -sSf |
+        sh -s -- --default-toolchain none -y
+    - runas: servo
+    - creates:
+      - {{ common.servo_home }}/.rustup
+      - {{ common.servo_home }}/.cargo
diff --git a/servo-build-dependencies/init.sls b/servo-build-dependencies/init.sls
index 7848189f..7b23a40e 100644
--- a/servo-build-dependencies/init.sls
+++ b/servo-build-dependencies/init.sls
@@ -4,14 +4,6 @@ include:
   - python
 
 servo-dependencies:
-  cmd.run:
-    - name: |
-        curl https://sh.rustup.rs -sSf |
-        sh -s -- --default-toolchain none -y
-    - runas: servo
-    - creates:
-      - {{ common.servo_home }}/.rustup
-      - {{ common.servo_home }}/.cargo
   pkg.installed:
     {% if grains['os'] == 'Ubuntu' %}
     - require: