Update deployment scripts

Author: alexcrichton

.travis.yml

@@ -156,9 +156,3 @@ deploy:
       secure: "fcKM0bWHz1UJVnZdQl/kCrFCykDkdwOAy1o5LAsUEkgNwSiWF4qC2sqHUbz2hCIe2tD5D8UCqa7brgSz0HNTL1yvSeOO/0Vim8xP9ev9SMf0Muekq0Wj/Kw4kJ3C4ajHdOdF2zXGnw9tsitzylLqx/r8cu0S8UtI49sIAWF3+/dD/uGnXu+wtaYiUJ1znirDzq74rHLrk8M/kQDFTrDJ8D+wXbKSJP9nmKkFShkW8A71QmaCOUqG3q7SpylY81rKRjHjtXCWJ3CHkD7XpdxdsImnukDtt8OndJH+9691TPKcR/RUC/dnUYg5QignmV83AN84c2/6ZykarQ9M/ziBYRI92bj0vPhoHu/vk2HY1VgWlX9qbXfVzd8glfmtS6be7eNYPtEHxoSu9o6WSbVaFv/07IapY/f7vE0kflvW58hRjdy8k4Sv31qPFO0hs7NFJMCRCam/uPpWKTEhfIjAJH6PoXOvND92ZHi9rjnwfVtXEClYtl5vPkRgPTkKJXzF+jVl9sDX1WhZhfgqRNNWEVyfoiptNxHygavDGCPsjpKVMmvntM8dsMZmewSeKemratN2seTP5q4d/IVbgONXiH/SDFhzXkIy4W/MdbxEjXBaVW0DT7x5k/CZhx1ZBIquWhE52nZWpBsJdpCiWl9AORDYVQnCjNp8hWXX7TlIBe4="
     on:
       branch: stable
-
-# FIXME: I don't know if this really works
-after_deploy:
-  - sudo pip install awscli
-  - aws configure set preview.cloudfront true
-  - aws cloudfront create-invalidation --paths "rustup/$TARGET/* rustup/dev/$TARGET/* rustup/www/* rustup/dev/www/* rustup/* rustup/dev/*"

ci/sync-dist.py

@@ -89,15 +89,15 @@ def usage():
     if os.path.exists("local-rustup/dist"):
         shutil.rmtree("local-rustup/dist")
     os.makedirs("local-rustup/dist")
-    s3cmd = "s3cmd sync s3://{}/rustup/dist/ ./local-rustup/dist/".format(s3_bucket)
+    s3cmd = "aws s3 cp --recursive s3://{}/rustup/dist/ ./local-rustup/dist/".format(s3_bucket)
 elif command == "local-to-dev-archives" \
      or command == "local-to-prod-archives":
-    s3cmd = "s3cmd sync ./local-rustup/dist/ s3://{}/rustup/archive/{}/".format(s3_bucket, archive_version)
+    s3cmd = "aws s3 cp --recursive ./local-rustup/dist/ s3://{}/rustup/archive/{}/".format(s3_bucket, archive_version)
 elif command == "local-to-prod":
-    s3cmd = "s3cmd sync ./local-rustup/dist/ s3://{}/rustup/dist/".format(s3_bucket)
+    s3cmd = "aws s3 cp --recursive local-rustup/dist/ s3://{}/rustup/dist/".format(s3_bucket)
 elif command == "update-dev-release" \
      or command == "update-prod-release":
-    s3cmd = "s3cmd put ./local-rustup/release-stable.toml s3://{}/rustup/release-stable.toml".format(s3_bucket)
+    s3cmd = "aws s3 cp ./local-rustup/release-stable.toml s3://{}/rustup/release-stable.toml".format(s3_bucket)
 else:
     sys.exit(1)
 
@@ -115,11 +115,13 @@ def run_s3cmd(command):
     s3cmd = command.split(" ")
 
     if not live_run:
-        s3cmd += ["--dry-run"]
+        s3cmd += ["--dryrun"]
 
     # These are old installer names for compatibility. They don't need to
     # be touched ever again.
-    s3cmd += ["--exclude=*rustup-setup*"]
+    if "cloudfront" not in command:
+        s3cmd += ["--exclude=*rustup-setup*"]
+    print('executing: ', s3cmd);
 
     subprocess.check_call(s3cmd)
 
@@ -130,16 +132,30 @@ def run_s3cmd(command):
 if command == "dev-to-local":
     if os.path.exists("local-rustup/rustup-init.sh"):
         os.remove("local-rustup/rustup-init.sh")
-    run_s3cmd("s3cmd get s3://{}/rustup/rustup-init.sh ./local-rustup/rustup-init.sh"
+    run_s3cmd("aws s3 cp s3://{}/rustup/rustup-init.sh ./local-rustup/rustup-init.sh"
               .format(s3_bucket))
     if os.path.exists("local-rustup/www"):
         shutil.rmtree("local-rustup/www")
     os.makedirs("local-rustup/www")
-    run_s3cmd("s3cmd sync s3://{}/rustup/www/ ./local-rustup/www/"
+    run_s3cmd("aws s3 cp --recursive s3://{}/rustup/www/ ./local-rustup/www/"
               .format(s3_bucket))
 
 if command == "local-to-prod":
-    run_s3cmd("s3cmd put ./local-rustup/rustup-init.sh s3://{}/rustup/rustup-init.sh"
+    run_s3cmd("aws s3 cp ./local-rustup/rustup-init.sh s3://{}/rustup/rustup-init.sh"
               .format(s3_bucket))
-    run_s3cmd("s3cmd sync ./local-rustup/www/ s3://{}/rustup/www/"
+    run_s3cmd("aws s3 cp --recursive ./local-rustup/www/ s3://{}/rustup/www/"
               .format(s3_bucket))
+    if live_run:
+        # Invalidate sh.rustup.rs
+        run_s3cmd("aws cloudfront create-invalidation --distribution-id " +
+                  "E70E9RGZ6Q27W --paths /*".format(s3_bucket))
+        # Invalidate win.rustup.rs
+        run_s3cmd("aws cloudfront create-invalidation --distribution-id " +
+                  "E2XBMULPACBLNE --paths /*".format(s3_bucket))
+        # Invalidate rustup.rs
+        run_s3cmd("aws cloudfront create-invalidation --distribution-id " +
+                  "EVJCMYBQ0EX26 --paths /*".format(s3_bucket))
+
+if command == "update-dev-release" and live_run:
+    run_s3cmd("aws cloudfront create-invalidation --distribution-id " +
+              "E30AO2GXMDY230 --paths /rustup/*".format(s3_bucket))