From 8944582d1d51f64d38a88791a30e1b2d415ef123 Mon Sep 17 00:00:00 2001
From: Alex Crichton <alex@alexcrichton.com>
Date: Wed, 25 Jan 2017 11:55:30 -0800
Subject: [PATCH] travis: Upload all artifacts in build/dist

Previously we only uploaded tarballs, but this modifies Travis/AppVeyor to
upload everything. We shouldn't have anything else in there to worry about and
otherwise we need to be sure to pick up pkg/msi/exe installers.
---
 .travis.yml  | 4 ++--
 appveyor.yml | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index bbe0cdfb6f8f0..0f73f67224b76 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -124,9 +124,9 @@ before_deploy:
   - mkdir -p deploy/$TRAVIS_COMMIT
   - >
       if [ "$TRAVIS_OS_NAME" == "osx" ]; then
-          cp build/dist/*.tar.gz deploy/$TRAVIS_COMMIT;
+          cp -r build/dist deploy/$TRAVIS_COMMIT;
       else
-          cp obj/build/dist/*.tar.gz deploy/$TRAVIS_COMMIT;
+          cp -r obj/build/dist deploy/$TRAVIS_COMMIT;
       fi
 
 deploy:
diff --git a/appveyor.yml b/appveyor.yml
index f158d788d16af..418cdcb07af4e 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -137,7 +137,7 @@ branches:
 before_deploy:
   - ps: |
         New-Item -Path deploy -ItemType directory
-        Get-ChildItem -Path build\dist -Filter '*.tar.gz' | Move-Item -Destination deploy
+        Get-ChildItem -Path build\dist | Move-Item -Destination deploy
         Get-ChildItem -Path deploy | Foreach-Object {
           Push-AppveyorArtifact $_.FullName -FileName ${env:APPVEYOR_REPO_COMMIT}/$_
         }
@@ -151,7 +151,7 @@ deploy:
     bucket: rust-lang-ci
     set_public: true
     region: us-east-1
-    artifact: /.*\.tar.gz/
+    artifact: /.*/
     folder: rustc-builds
     on:
       branch: auto