diff options
| author | Billy O'Neal <bion@microsoft.com> | 2021-08-02 14:15:48 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-08-02 14:15:48 -0700 |
| commit | 403c952a0c6496e07cdf995114fe8b9ae5e1f65c (patch) | |
| tree | 8dea3f75e012706112d7f95876a5009ac1eeedef /scripts | |
| parent | 261c458af6e3eed5d099144aff95d2b5035f656b (diff) | |
| download | vcpkg-403c952a0c6496e07cdf995114fe8b9ae5e1f65c.tar.gz vcpkg-403c952a0c6496e07cdf995114fe8b9ae5e1f65c.zip | |
Clean the downloads directory every CI run. (#19311)
Now that vcpkg has artifact caching, meaning downloading artifacts usually doesn't have to leave the datacenter, there's no need to potentially dirty different runs with leftover downloads from each other.
This resulted in some "impossible" results in https://github.com/microsoft/vcpkg/pull/18687 where a previous PR run accidentially downloaded the Windows version of nodejs to /mnt/vcpkg-ci/downloads/node-v14.17.4-linux-x64.tar.xz
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/azure-pipelines/linux/azure-pipelines.yml | 3 | ||||
| -rw-r--r-- | scripts/azure-pipelines/osx/azure-pipelines.yml | 1 | ||||
| -rw-r--r-- | scripts/azure-pipelines/windows/azure-pipelines.yml | 7 |
3 files changed, 5 insertions, 6 deletions
diff --git a/scripts/azure-pipelines/linux/azure-pipelines.yml b/scripts/azure-pipelines/linux/azure-pipelines.yml index 0c126d886..e76ebc5b6 100644 --- a/scripts/azure-pipelines/linux/azure-pipelines.yml +++ b/scripts/azure-pipelines/linux/azure-pipelines.yml @@ -28,10 +28,11 @@ jobs: displayName: 'Create /home/agent'
# Note: /mnt is the Azure machines' temporary disk.
- bash: |
+ sudo rm -rf ${{ variables.VCPKG_DOWNLOADS }}
sudo mkdir ${{ variables.WORKING_ROOT }} -m=777
sudo mkdir ${{ variables.VCPKG_DOWNLOADS }} -m=777
exit 0
- displayName: 'Create ${{ variables.VCPKG_DOWNLOADS }}'
+ displayName: 'Create ${{ variables.WORKING_ROOT }} and ${{ variables.VCPKG_DOWNLOADS }}'
- task: Bash@3
displayName: 'Bootstrap vcpkg'
inputs:
diff --git a/scripts/azure-pipelines/osx/azure-pipelines.yml b/scripts/azure-pipelines/osx/azure-pipelines.yml index 2e9f05d63..38eb7fa7b 100644 --- a/scripts/azure-pipelines/osx/azure-pipelines.yml +++ b/scripts/azure-pipelines/osx/azure-pipelines.yml @@ -25,6 +25,7 @@ jobs: - bash: df -h
displayName: 'Report on Disk Space'
- bash: |
+ sudo rm -rf ${{ variables.VCPKG_DOWNLOADS }} || 0
sudo mkdir ${{ variables.VCPKG_DOWNLOADS }} || 0
sudo chmod 777 ${{ variables.VCPKG_DOWNLOADS }} || 0
exit 0
diff --git a/scripts/azure-pipelines/windows/azure-pipelines.yml b/scripts/azure-pipelines/windows/azure-pipelines.yml index 9b52378b5..c70eab86b 100644 --- a/scripts/azure-pipelines/windows/azure-pipelines.yml +++ b/scripts/azure-pipelines/windows/azure-pipelines.yml @@ -29,11 +29,8 @@ jobs: - script: .\bootstrap-vcpkg.bat
displayName: 'Bootstrap vcpkg'
- script: |
- dir ${{ variables.VCPKG_DOWNLOADS }} 2>&1 || (call )
- dir ${{ variables.VCPKG_DOWNLOADS }}\tools 2>&1 || (call )
- dir ${{ variables.VCPKG_DOWNLOADS }}\tools\msys2 2>&1 || (call )
- rmdir /S /Q ${{ variables.VCPKG_DOWNLOADS }}\tools\msys2 2>&1 || (call )
- displayName: 'Clean msys2 downloads'
+ rmdir /S /Q ${{ variables.VCPKG_DOWNLOADS }} 2>&1
+ displayName: 'Clean downloads'
- task: PowerShell@2
displayName: '*** Test Modified Ports and Prepare Test Logs ***'
inputs:
|