Skip to content

Commit c039f0c

Browse files
mstfblmichaelgsharp
authored andcommitted
Fixing failing Arcade Windows Builds (#5482)
* Try Windows build single quote fix * Remove %20 * Added variable space value * Using variables for spacing * Added space values as job parameters * Try conditional variables again
1 parent c94b23f commit c039f0c

File tree

1 file changed

+7
-3
lines changed

1 file changed

+7
-3
lines changed

build/ci/job-template.yml

+7-3
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,10 @@ jobs:
2929
packageUpdaterProjPath: $(Build.SourcesDirectory)/test/Microsoft.ML.NugetPackageVersionUpdater/Microsoft.ML.NugetPackageVersionUpdater.csproj
3030
versionFilePath: $(Build.SourcesDirectory)/test/Microsoft.ML.NugetPackageVersionUpdater/latest_versions.txt
3131
PROCDUMP_PATH: '$(Build.SourcesDirectory)/Tools/ProcDump/'
32+
${{ if eq(parameters.buildScript, 'build.cmd') }}:
33+
spaceValue: ' '
34+
${{ if eq(parameters.buildScript, './build.sh') }}:
35+
spaceValue: '%20'
3236
strategy:
3337
matrix:
3438
${{ if eq(parameters.customMatrixes, '') }}:
@@ -112,10 +116,10 @@ jobs:
112116
- ${{ if eq(parameters.innerLoop, 'false') }}:
113117
- ${{ if and(eq(parameters.runSpecific, 'false'), eq(parameters.useVSTestTask, 'false')) }}:
114118
# TODO: Code coverage needs to be fixed.
115-
- script: ${{ parameters.buildScript }} -configuration $(_configuration) -test -ci /p:TestRunnerAdditionalArguments=-notrait%20Category=SkipInCI #-coverage=${{ parameters.codeCoverage }}
119+
- script: ${{ parameters.buildScript }} -configuration $(_configuration) -test -ci #-coverage=${{ parameters.codeCoverage }}
116120
displayName: Run All Tests.
117121
- ${{ if and(eq(parameters.runSpecific, 'true'), eq(parameters.useVSTestTask, 'false')) }}:
118-
- script: ${{ parameters.buildScript }} -configuration $(_configuration) -ci /p:TestRunnerAdditionalArguments=-trait%20Category=RunSpecificTest #-coverage=${{ parameters.codeCoverage }}
122+
- script: ${{ parameters.buildScript }} -configuration $(_configuration) -ci /p:TestRunnerAdditionalArguments='-trait$(spaceValue)Category=RunSpecificTest' #-coverage=${{ parameters.codeCoverage }}
119123
displayName: Run Specific Tests.
120124
- ${{ if and(eq(parameters.buildScript, 'build.cmd'), eq(parameters.useVSTestTask, 'true')) }}:
121125
- task: VSTest@2
@@ -139,7 +143,7 @@ jobs:
139143
collectDumpOn: onAbortOnly
140144
publishRunAttachments: true
141145
- ${{ if eq(parameters.innerLoop, 'true') }}:
142-
- script: ${{ parameters.buildScript }} -configuration $(_configuration) -test -ci /p:TestRunnerAdditionalArguments=-notrait%20Category=SkipInCI #-coverage=${{ parameters.codeCoverage }}
146+
- script: ${{ parameters.buildScript }} -configuration $(_configuration) -test -ci /p:TestRunnerAdditionalArguments='-notrait$(spaceValue)Category=SkipInCI' #-coverage=${{ parameters.codeCoverage }}
143147
displayName: Run CI Tests.
144148
- script: $(dotnetPath) msbuild -restore build/Codecoverage.proj
145149
displayName: Upload coverage to codecov.io

0 commit comments

Comments
 (0)