Merge pull request #4751 from psibi/test-pr

Change S3 Bucket names & cache policy for PR's
commercialhaskell · Apr 17, 2019 · 310d97e · 310d97e
2 parents ddca714 + 193421b
commit 310d97e
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 2 deletions.
diff --git a/.azure/azure-linux-template.yml b/.azure/azure-linux-template.yml
@@ -115,6 +115,7 @@ jobs:
         cache-s3 --prefix="${CACHE_S3_PREFIX}" --git-branch="$(Build.SourceBranchName)" --suffix="${OS_NAME}" save stack;
       fi;
       cache-s3 --prefix="${CACHE_S3_PREFIX}" --git-branch="$(Build.SourceBranchName)" --suffix="${OS_NAME}" save stack work
+    condition: and(succeeded(), in(variables['Build.Reason'], 'IndividualCI', 'BatchedCI'))
     env:
       OS_NAME: ${{ parameters.os }}
     displayName: 'Cache data'
diff --git a/.azure/azure-osx-template.yml b/.azure/azure-osx-template.yml
@@ -41,6 +41,7 @@ jobs:
         cache-s3 --prefix="${CACHE_S3_PREFIX}" --git-branch="$(Build.SourceBranchName)" --suffix="${OS_NAME}" save stack;
       fi;
       cache-s3 --prefix="${CACHE_S3_PREFIX}" --git-branch="$(Build.SourceBranchName)" --suffix="${OS_NAME}" save stack work
+    condition: and(succeeded(), in(variables['Build.Reason'], 'IndividualCI', 'BatchedCI'))
     env:
       OS_NAME: ${{ parameters.os }}
     displayName: 'Cache data'
diff --git a/.azure/azure-windows-template.yml b/.azure/azure-windows-template.yml
@@ -45,6 +45,7 @@ jobs:
         /tmp/cache-s3 --prefix="${CACHE_S3_PREFIX}" --git-branch="$(Build.SourceBranchName)" --suffix="${OS_NAME}" save stack;
       fi;
       /tmp/cache-s3 --prefix="${CACHE_S3_PREFIX}" --git-branch="$(Build.SourceBranchName)" --suffix="${OS_NAME}" save stack work
+    condition: and(succeeded(), in(variables['Build.Reason'], 'IndividualCI', 'BatchedCI'))
     env:
       OS_NAME: ${{ parameters.os }}
     displayName: 'Cache data'
diff --git a/azure-nightly-pipeline.yml b/azure-nightly-pipeline.yml
@@ -5,7 +5,7 @@ variables:
   BASE_BRANCH: "master"
   CACHE_S3_PREFIX: "stack"
   CACHE_S3_VERSION: "v0.1.4"
-  S3_BUCKET: "fpco-gitlab-runner-pipeline-cache"
+  S3_BUCKET: "fpco-public-cache"
   AWS_REGION: "us-east-1"
 
 jobs:

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -10,7 +10,7 @@ variables:
   BASE_BRANCH: "master"
   CACHE_S3_PREFIX: "stack"
   CACHE_S3_VERSION: "v0.1.4"
-  S3_BUCKET: "fpco-gitlab-runner-pipeline-cache"
+  S3_BUCKET: "fpco-public-cache"
   AWS_REGION: "us-east-1"
 
 jobs: