From a83250dcfa5d0751f7d896cb8999ef76ea074771 Mon Sep 17 00:00:00 2001 From: Alex Crichton Date: Tue, 21 May 2019 10:38:05 -0700 Subject: [PATCH] Update upload logic to upload right directory --- .azure-pipelines/steps/run.yml | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/.azure-pipelines/steps/run.yml b/.azure-pipelines/steps/run.yml index 2d38920da88e..3516ca598075 100644 --- a/.azure-pipelines/steps/run.yml +++ b/.azure-pipelines/steps/run.yml @@ -107,11 +107,19 @@ steps: - bash: | set -e + if [ "$AGENT_OS" = "Linux" ]; then + rm -rf obj/build/dist/doc + upload_dir=obj/build/dist deploy/$BUILD_SOURCEVERSION + else + rm -rf build/dist/doc + upload_dir=build/dist + fi + ls -la $upload_dir deploy_dir=rustc-builds if [ "$DEPLOY_ALT" == "1" ]; then deploy_dir=rustc-builds-alt fi - aws s3 cp --no-progress --recursive --acl public-read ./deploy s3://$DEPLOY_BUCKET/$deploy_dir + aws s3 cp --no-progress --recursive --acl public-read ./$upload_dir s3://$DEPLOY_BUCKET/$deploy_dir/$BUILD_SOURCEVERSION env: AWS_SECRET_ACCESS_KEY: $(AWS_SECRET_ACCESS_KEY) condition: and(succeeded(), or(eq(variables.DEPLOY, '1'), eq(variables.DEPLOY_ALT, '1')))