Skip to content

Commit 3520f7f

Browse files
authored
Fix Windows build: clean submodules (#911)
1 parent 03bf83e commit 3520f7f

File tree

2 files changed

+13
-5
lines changed

2 files changed

+13
-5
lines changed

.vsts.pipelines/builds/matrix.yml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,15 +48,17 @@ jobs:
4848
job: osx
4949
pool:
5050
name: Hosted macOS
51-
buildScript: ./build.sh
51+
scriptPrefix: ./
52+
scriptSuffix: .sh
5253
setupMac: true
5354

5455
- template: ../jobs/ci-local.yml
5556
parameters:
5657
job: windows
5758
pool:
5859
name: ${{ parameters.windowsPoolName }}
59-
buildScript: build.cmd
60+
scriptPrefix: ''
61+
scriptSuffix: .cmd
6062
setupWindows: true
6163
skipSmokeTest: true
6264
failOnPrebuiltBaselineError: false

.vsts.pipelines/jobs/ci-local.yml

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,8 @@ parameters:
33
matrix:
44
Production: {}
55
pool: null
6-
buildScript: null
6+
scriptPrefix: null
7+
scriptSuffix: null
78
setupMac: false
89
setupWindows: false
910
skipSmokeTest: false
@@ -41,6 +42,11 @@ jobs:
4142
- script: git clean -xdff
4243
displayName: Clean leftover submodules
4344

45+
# Run 'clean -a' script to recursively clean submodules: AzDO doesn't do this, and otherwise we
46+
# fail to apply patches on persistent machines like dotnet-external-temp.
47+
- script: ${{ format('{0}clean{1} -a', parameters.scriptPrefix, parameters.scriptSuffix) }}
48+
displayName: Run source-build 'clean all' script
49+
4450
- template: ../steps/check-space-powershell.yml
4551

4652
- ${{ if eq(parameters.setupMac, true) }}:
@@ -56,15 +62,15 @@ jobs:
5662
- template: ../steps/check-space-powershell.yml
5763

5864
# Build source-build.
59-
- script: ${{ format('{0} $(args.build)', parameters.buildScript) }}
65+
- script: ${{ format('{0}build{1} $(args.build)', parameters.scriptPrefix, parameters.scriptSuffix) }}
6066
displayName: Build source-build
6167
timeoutInMinutes: 150
6268

6369
- template: ../steps/check-space-powershell.yml
6470

6571
# Run smoke tests.
6672
- ${{ if ne(parameters.skipSmokeTest, true) }}:
67-
- bash: ${{ format('{0} $(args.smokeTest)', parameters.buildScript) }}
73+
- bash: ${{ format('{0}build{1} $(args.smokeTest)', parameters.scriptPrefix, parameters.scriptSuffix) }}
6874
displayName: Run smoke-test
6975

7076
# Gather artifacts. Uses git bash on Windows.

0 commit comments

Comments
 (0)