about summary refs log tree commit diff
diff options
context:
space:
mode:
authorAlex Crichton <alex@alexcrichton.com>2019-05-20 14:37:24 -0700
committerAlex Crichton <alex@alexcrichton.com>2019-05-20 14:37:24 -0700
commit9843a79496a4943b882d8046abfbff52caf51c3d (patch)
treefe172131c646aca29a84690b0a40c15281840a4f
parent12f370156ddcdff567e7b0acf83cdf871a997a0a (diff)
downloadrust-9843a79496a4943b882d8046abfbff52caf51c3d.tar.gz
rust-9843a79496a4943b882d8046abfbff52caf51c3d.zip
Finalize AWS install
-rw-r--r--.azure-pipelines/steps/run.yml29
1 files changed, 13 insertions, 16 deletions
diff --git a/.azure-pipelines/steps/run.yml b/.azure-pipelines/steps/run.yml
index 2d98efd586e..dfe54e65e4e 100644
--- a/.azure-pipelines/steps/run.yml
+++ b/.azure-pipelines/steps/run.yml
@@ -8,22 +8,6 @@
 
 steps:
 
-# Ensure the `aws` CLI is installed so we can deploy later on, cache docker
-# images, etc.
-- bash: |
-    set -e
-    sudo apt-get install -y python3-setuptools
-    pip3 install awscli --upgrade --user
-    echo "##vso[task.prependpath]$HOME/.local/bin"
-  displayName: Install awscli (Linux)
-  condition: and(succeeded(), eq(variables['Agent.OS'], 'Linux'))
-- script: pip install awscli
-  displayName: Install awscli (non-Linux)
-  condition: and(succeeded(), ne(variables['Agent.OS'], 'Linux'))
-
-- bash: aws s3 help
-- bash: exit 1
-
 - checkout: self
   fetchDepth: 2
 
@@ -67,6 +51,19 @@ steps:
   condition: and(succeeded(), eq(variables['Agent.OS'], 'Windows_NT'))
   displayName: Check out submodules (Windows)
 
+# Ensure the `aws` CLI is installed so we can deploy later on, cache docker
+# images, etc.
+- bash: |
+    set -e
+    sudo apt-get install -y python3-setuptools
+    pip3 install awscli --upgrade --user
+    echo "##vso[task.prependpath]$HOME/.local/bin"
+  displayName: Install awscli (Linux)
+  condition: and(succeeded(), eq(variables['Agent.OS'], 'Linux'))
+- script: pip install awscli
+  displayName: Install awscli (non-Linux)
+  condition: and(succeeded(), ne(variables['Agent.OS'], 'Linux'))
+
 # Configure our CI_JOB_NAME variable which log analyzers can use for the main
 # step to see what's going on.
 - bash: echo "##vso[task.setvariable variable=CI_JOB_NAME]$SYSTEM_JOBNAME"