From 403c952a0c6496e07cdf995114fe8b9ae5e1f65c Mon Sep 17 00:00:00 2001 From: Billy O'Neal Date: Mon, 2 Aug 2021 14:15:48 -0700 Subject: [PATCH] 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 --- scripts/azure-pipelines/linux/azure-pipelines.yml | 3 ++- scripts/azure-pipelines/osx/azure-pipelines.yml | 1 + 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 0c126d886c..e76ebc5b66 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 2e9f05d637..38eb7fa7b3 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 9b52378b50..c70eab86b6 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: