From 50719a7ce0f411554f7bfa4258789b33282f0172 Mon Sep 17 00:00:00 2001 From: "Curtis.Bezault" Date: Mon, 13 Apr 2020 14:18:23 -0700 Subject: [PATCH 1/3] Point TMP to the D drive --- azure-devops/run-build.yml | 8 ++++++++ azure-pipelines.yml | 8 ++++++++ 2 files changed, 16 insertions(+) diff --git a/azure-devops/run-build.yml b/azure-devops/run-build.yml index 27a0f41c0db..9640f0a6b5f 100644 --- a/azure-devops/run-build.yml +++ b/azure-devops/run-build.yml @@ -10,6 +10,10 @@ jobs: variables: vcpkgLocation: '$(Build.SourcesDirectory)/vcpkg' steps: + - script: | + rmdir /S /Q $(tmpDir) + mkdir $(tmpDir) + displayName: 'Setup TMP Directory' - checkout: self clean: true submodules: true @@ -28,6 +32,7 @@ jobs: vcpkgArguments: 'boost-build' vcpkgDirectory: '$(vcpkgLocation)' vcpkgTriplet: 'x86-windows' + env: { TMP: $(tmpDir) } - task: run-vcpkg@0 displayName: 'Run vcpkg' timeoutInMinutes: 10 @@ -35,6 +40,7 @@ jobs: vcpkgArguments: 'boost-math' vcpkgDirectory: '$(vcpkgLocation)' vcpkgTriplet: '${{ parameters.targetPlatform }}-windows' + env: { TMP: $(tmpDir) } - task: PowerShell@2 displayName: 'Get Test Parallelism' timeoutInMinutes: 2 @@ -53,6 +59,7 @@ jobs: useVcpkgToolchainFile: true cmakeAppendedArgs: | -G Ninja -DBUILD_TESTING=TRUE -DENABLE_XUNIT_OUTPUT=TRUE -DADDITIONAL_LIT_FLAGS=-j$(testParallelism) + env: { TMP: $(tmpDir) } - task: CmdLine@2 displayName: 'Run Tests' timeoutInMinutes: 120 @@ -63,6 +70,7 @@ jobs: call "%PROGRAMFILES(X86)%\Microsoft Visual Studio\2019\Preview\Common7\Tools\VsDevCmd.bat" ^ -host_arch=${{ parameters.vsDevCmdArch }} -arch=${{ parameters.vsDevCmdArch }} -no_logo ctest -V + env: { TMP: $(tmpDir) } - task: PublishTestResults@2 displayName: 'Publish libcxx Tests' timeoutInMinutes: 10 diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 9fcade90b54..8e0b448a46a 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -5,6 +5,7 @@ variables: agentPool: 'StlBuild-2020-04-04-3' + tmpDir: 'D:\Temp' stages: - stage: Code_Format @@ -17,6 +18,10 @@ stages: name: $(agentPool) steps: + - script: | + rmdir /S /Q $(tmpDir) + mkdir $(tmpDir) + displayName: 'Setup TMP Directory' - checkout: self clean: true submodules: false @@ -28,6 +33,7 @@ stages: cd $(Build.ArtifactStagingDirectory)\tools cmake --build . displayName: 'Build Support Tools' + env: { TMP: $(tmpDir) } - task: BatchScript@1 displayName: 'Enforce clang-format' timeoutInMinutes: 60 @@ -35,6 +41,7 @@ stages: filename: 'azure-devops/enforce-clang-format.cmd' failOnStandardError: true arguments: '$(Build.ArtifactStagingDirectory)/tools/parallelize/parallelize.exe' + env: { TMP: $(tmpDir) } - task: BatchScript@1 displayName: 'Validate Files' timeoutInMinutes: 2 @@ -42,6 +49,7 @@ stages: filename: 'azure-devops/validate-files.cmd' failOnStandardError: true arguments: '$(Build.ArtifactStagingDirectory)/tools/validate/validate.exe' + env: { TMP: $(tmpDir) } - stage: Build_And_Test displayName: 'Build and Test' jobs: From c5826a817a2f1c4f955e554532156c184b28083e Mon Sep 17 00:00:00 2001 From: "Curtis.Bezault" Date: Mon, 13 Apr 2020 14:26:33 -0700 Subject: [PATCH 2/3] Avoid warning in rmdir --- azure-devops/run-build.yml | 4 +++- azure-pipelines.yml | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/azure-devops/run-build.yml b/azure-devops/run-build.yml index 9640f0a6b5f..92e39adecdb 100644 --- a/azure-devops/run-build.yml +++ b/azure-devops/run-build.yml @@ -11,7 +11,9 @@ jobs: vcpkgLocation: '$(Build.SourcesDirectory)/vcpkg' steps: - script: | - rmdir /S /Q $(tmpDir) + if exist "$(tmpDir)" ( + rmdir /S /Q $(tmpDir) + ) mkdir $(tmpDir) displayName: 'Setup TMP Directory' - checkout: self diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 8e0b448a46a..d5f7496a908 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -19,7 +19,9 @@ stages: steps: - script: | - rmdir /S /Q $(tmpDir) + if exist "$(tmpDir)" ( + rmdir /S /Q $(tmpDir) + ) mkdir $(tmpDir) displayName: 'Setup TMP Directory' - checkout: self From 93f14ece17c12c8e36af0ed0af57e73c84cb8dd3 Mon Sep 17 00:00:00 2001 From: "Curtis.Bezault" Date: Mon, 13 Apr 2020 21:46:07 -0700 Subject: [PATCH 3/3] Also set TEMP --- azure-devops/run-build.yml | 8 ++++---- azure-pipelines.yml | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/azure-devops/run-build.yml b/azure-devops/run-build.yml index 92e39adecdb..75194adf08e 100644 --- a/azure-devops/run-build.yml +++ b/azure-devops/run-build.yml @@ -34,7 +34,7 @@ jobs: vcpkgArguments: 'boost-build' vcpkgDirectory: '$(vcpkgLocation)' vcpkgTriplet: 'x86-windows' - env: { TMP: $(tmpDir) } + env: { TMP: $(tmpDir), TEMP: $(tmpDir) } - task: run-vcpkg@0 displayName: 'Run vcpkg' timeoutInMinutes: 10 @@ -42,7 +42,7 @@ jobs: vcpkgArguments: 'boost-math' vcpkgDirectory: '$(vcpkgLocation)' vcpkgTriplet: '${{ parameters.targetPlatform }}-windows' - env: { TMP: $(tmpDir) } + env: { TMP: $(tmpDir), TEMP: $(tmpDir) } - task: PowerShell@2 displayName: 'Get Test Parallelism' timeoutInMinutes: 2 @@ -61,7 +61,7 @@ jobs: useVcpkgToolchainFile: true cmakeAppendedArgs: | -G Ninja -DBUILD_TESTING=TRUE -DENABLE_XUNIT_OUTPUT=TRUE -DADDITIONAL_LIT_FLAGS=-j$(testParallelism) - env: { TMP: $(tmpDir) } + env: { TMP: $(tmpDir), TEMP: $(tmpDir) } - task: CmdLine@2 displayName: 'Run Tests' timeoutInMinutes: 120 @@ -72,7 +72,7 @@ jobs: call "%PROGRAMFILES(X86)%\Microsoft Visual Studio\2019\Preview\Common7\Tools\VsDevCmd.bat" ^ -host_arch=${{ parameters.vsDevCmdArch }} -arch=${{ parameters.vsDevCmdArch }} -no_logo ctest -V - env: { TMP: $(tmpDir) } + env: { TMP: $(tmpDir), TEMP: $(tmpDir) } - task: PublishTestResults@2 displayName: 'Publish libcxx Tests' timeoutInMinutes: 10 diff --git a/azure-pipelines.yml b/azure-pipelines.yml index d5f7496a908..bbb060b7162 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -35,7 +35,7 @@ stages: cd $(Build.ArtifactStagingDirectory)\tools cmake --build . displayName: 'Build Support Tools' - env: { TMP: $(tmpDir) } + env: { TMP: $(tmpDir), TEMP: $(tmpDir) } - task: BatchScript@1 displayName: 'Enforce clang-format' timeoutInMinutes: 60 @@ -43,7 +43,7 @@ stages: filename: 'azure-devops/enforce-clang-format.cmd' failOnStandardError: true arguments: '$(Build.ArtifactStagingDirectory)/tools/parallelize/parallelize.exe' - env: { TMP: $(tmpDir) } + env: { TMP: $(tmpDir), TEMP: $(tmpDir) } - task: BatchScript@1 displayName: 'Validate Files' timeoutInMinutes: 2 @@ -51,7 +51,7 @@ stages: filename: 'azure-devops/validate-files.cmd' failOnStandardError: true arguments: '$(Build.ArtifactStagingDirectory)/tools/validate/validate.exe' - env: { TMP: $(tmpDir) } + env: { TMP: $(tmpDir), TEMP: $(tmpDir) } - stage: Build_And_Test displayName: 'Build and Test' jobs: