From d5e26527a69376ddee55a02efaf6184dbcd682fd Mon Sep 17 00:00:00 2001 From: Anthony Dresser Date: Mon, 2 Dec 2019 11:06:52 -0800 Subject: [PATCH] Clean windows agent on pipeline (#8503) * add step to clean repo since agent does start clean * move clean * disable caaching for windows agent --- .../win32/sql-product-build-win32.yml | 40 ++++++++++--------- 1 file changed, 22 insertions(+), 18 deletions(-) diff --git a/build/azure-pipelines/win32/sql-product-build-win32.yml b/build/azure-pipelines/win32/sql-product-build-win32.yml index 2e437c0f23..f32c7540bf 100644 --- a/build/azure-pipelines/win32/sql-product-build-win32.yml +++ b/build/azure-pipelines/win32/sql-product-build-win32.yml @@ -7,6 +7,10 @@ steps: inputs: versionSpec: "1.x" + - powershell: | + git clean -fxd + displayName: Clean repo + # - task: UsePythonVersion@0 # inputs: # versionSpec: '2.x' @@ -33,11 +37,11 @@ steps: git merge $(node -p "require('./package.json').distro") displayName: Merge distro - - task: 1ESLighthouseEng.PipelineArtifactCaching.RestoreCacheV1.RestoreCache@1 - inputs: - keyfile: '.yarnrc, remote/.yarnrc, **/yarn.lock, !**/node_modules/**/yarn.lock, !**/.*/**/yarn.lock, !samples/**/yarn.lock' - targetfolder: '**/node_modules, !**/node_modules/**/node_modules, !samples/**/node_modules' - vstsFeed: 'BuildCache' + # - task: 1ESLighthouseEng.PipelineArtifactCaching.RestoreCacheV1.RestoreCache@1 + # inputs: + # keyfile: '.yarnrc, remote/.yarnrc, **/yarn.lock, !**/node_modules/**/yarn.lock, !**/.*/**/yarn.lock, !samples/**/yarn.lock' + # targetfolder: '**/node_modules, !**/node_modules/**/node_modules, !samples/**/node_modules' + # vstsFeed: 'BuildCache' - powershell: | . build/azure-pipelines/win32/exec.ps1 @@ -45,21 +49,21 @@ steps: $env:CHILD_CONCURRENCY="1" exec { yarn --frozen-lockfile } displayName: Install dependencies - condition: and(succeeded(), ne(variables['CacheRestored'], 'true')) + # condition: and(succeeded(), ne(variables['CacheRestored'], 'true')) - - task: 1ESLighthouseEng.PipelineArtifactCaching.SaveCacheV1.SaveCache@1 - inputs: - keyfile: '.yarnrc, remote/.yarnrc, **/yarn.lock, !**/node_modules/**/yarn.lock, !**/.*/**/yarn.lock, !samples/**/yarn.lock' - targetfolder: '**/node_modules, !**/node_modules/**/node_modules, !samples/**/node_modules' - vstsFeed: 'BuildCache' - condition: and(succeeded(), ne(variables['CacheRestored'], 'true')) + # - task: 1ESLighthouseEng.PipelineArtifactCaching.SaveCacheV1.SaveCache@1 + # inputs: + # keyfile: '.yarnrc, remote/.yarnrc, **/yarn.lock, !**/node_modules/**/yarn.lock, !**/.*/**/yarn.lock, !samples/**/yarn.lock' + # targetfolder: '**/node_modules, !**/node_modules/**/node_modules, !samples/**/node_modules' + # vstsFeed: 'BuildCache' + # condition: and(succeeded(), ne(variables['CacheRestored'], 'true')) - - powershell: | - . build/azure-pipelines/win32/exec.ps1 - $ErrorActionPreference = "Stop" - exec { yarn postinstall } - displayName: Run postinstall scripts - condition: and(succeeded(), eq(variables['CacheRestored'], 'true')) + # - powershell: | + # . build/azure-pipelines/win32/exec.ps1 + # $ErrorActionPreference = "Stop" + # exec { yarn postinstall } + # displayName: Run postinstall scripts + # condition: and(succeeded(), eq(variables['CacheRestored'], 'true')) - powershell: | . build/azure-pipelines/win32/exec.ps1