From aaeba5f5146e39e237c1ab95c568b650195fbdba Mon Sep 17 00:00:00 2001 From: John Kleinschmidt Date: Mon, 10 Dec 2018 17:17:36 -0500 Subject: [PATCH 1/5] ci: Cleanup directories after build --- vsts.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/vsts.yml b/vsts.yml index 61fdd0f4cc830..dccc97e320944 100644 --- a/vsts.yml +++ b/vsts.yml @@ -233,6 +233,9 @@ jobs: condition: and(failed(), eq(variables['NOTIFY_SLACK'], '1')) timeoutInMinutes: 1 + - task: mspremier.PostBuildCleanup.PostBuildCleanup-task.PostBuildCleanup@3 + displayName: 'Clean Agent Directories' + - job: run_tests displayName: Run Tests dependsOn: build From 5efa99bac3740630aba070dee73f2d670b324376 Mon Sep 17 00:00:00 2001 From: John Kleinschmidt Date: Tue, 11 Dec 2018 13:03:24 -0500 Subject: [PATCH 2/5] Use rm to cleanup source directory --- vsts.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/vsts.yml b/vsts.yml index dccc97e320944..7a4d8c3b9abc2 100644 --- a/vsts.yml +++ b/vsts.yml @@ -233,8 +233,10 @@ jobs: condition: and(failed(), eq(variables['NOTIFY_SLACK'], '1')) timeoutInMinutes: 1 - - task: mspremier.PostBuildCleanup.PostBuildCleanup-task.PostBuildCleanup@3 - displayName: 'Clean Agent Directories' + - bash: | + rm -rf src + condition: always() + displayName: 'Cleanup source directories' - job: run_tests displayName: Run Tests From 35f46a5a39cc008b7d4a2b99ccd6253fac1e6d9a Mon Sep 17 00:00:00 2001 From: John Kleinschmidt Date: Tue, 11 Dec 2018 17:12:16 -0500 Subject: [PATCH 3/5] Update vsts.yml --- vsts.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/vsts.yml b/vsts.yml index 7a4d8c3b9abc2..de651a0634e68 100644 --- a/vsts.yml +++ b/vsts.yml @@ -234,9 +234,9 @@ jobs: timeoutInMinutes: 1 - bash: | - rm -rf src + rm -rf * condition: always() - displayName: 'Cleanup source directories' + displayName: 'Cleanup directories' - job: run_tests displayName: Run Tests From fce41260a618dbf066c03524c513cd0176c5d94e Mon Sep 17 00:00:00 2001 From: John Kleinschmidt Date: Wed, 12 Dec 2018 16:10:24 -0500 Subject: [PATCH 4/5] Check if files actually deleted --- vsts.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/vsts.yml b/vsts.yml index de651a0634e68..caba1fd149a81 100644 --- a/vsts.yml +++ b/vsts.yml @@ -234,7 +234,9 @@ jobs: timeoutInMinutes: 1 - bash: | + ls -la rm -rf * + ls -la condition: always() displayName: 'Cleanup directories' From db7eab14fb12d05c3eb9a941439c8b818224c5f6 Mon Sep 17 00:00:00 2001 From: John Kleinschmidt Date: Wed, 12 Dec 2018 17:36:04 -0500 Subject: [PATCH 5/5] Get rid of hidden files too --- vsts.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/vsts.yml b/vsts.yml index caba1fd149a81..736973f878043 100644 --- a/vsts.yml +++ b/vsts.yml @@ -234,9 +234,7 @@ jobs: timeoutInMinutes: 1 - bash: | - ls -la - rm -rf * - ls -la + rm -rf ..?* .[!.]* * condition: always() displayName: 'Cleanup directories'