Skip to content

Commit 7cc1f8a

Browse files
committed
Fix Helix jobs
- restore.cmd doesn't work well with `-projects`; script unconditionally adds `-all`
1 parent 4ba0c4d commit 7cc1f8a

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
lines changed

.azure/pipelines/ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -635,7 +635,7 @@ stages:
635635
# Build the shared framework
636636
- script: ./build.cmd -ci -nobl -all -pack /p:ASPNETCORE_TEST_LOG_DIR=artifacts/log
637637
displayName: Build shared fx
638-
- script: .\restore.cmd -ci -nobl /p:BuildInteropProjects=true
638+
- script: ./build.cmd -ci -nobl -noBuildRepoTasks -restore -noBuild -projects src/Grpc/**/*.csproj
639639
displayName: Restore interop projects
640640
- script: ./build.cmd -ci -nobl -noBuildRepoTasks -noRestore -test -all -noBuildNative -projects eng\helix\helix.proj
641641
/p:IsRequiredCheck=true /p:IsHelixJob=true /p:BuildInteropProjects=true /p:RunTemplateTests=true

.azure/pipelines/helix-matrix.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ jobs:
2828
# Build the shared framework
2929
- script: ./build.cmd -ci -nobl -all -pack /p:ASPNETCORE_TEST_LOG_DIR=artifacts/log
3030
displayName: Build shared fx
31-
- script: .\restore.cmd -ci /p:BuildInteropProjects=true
31+
- script: ./build.cmd -ci -nobl -restore -noBuild -projects src/Grpc/**/*.csproj
3232
displayName: Restore interop projects
3333
- script: .\build.cmd -ci -nobl -NoRestore -test -all -projects eng\helix\helix.proj
3434
/p:IsHelixDaily=true /p:IsRequiredCheck=true /p:IsHelixJob=true /p:BuildInteropProjects=true

.azure/pipelines/quarantined-tests.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ jobs:
3333
# Build the shared framework
3434
- script: ./build.cmd -ci -all -pack /p:ASPNETCORE_TEST_LOG_DIR=artifacts/log /bl:artifacts/log/helix.build.x64.binlog
3535
displayName: Build shared fx
36-
- script: .\restore.cmd -ci /p:BuildInteropProjects=true
36+
- script: ./build.cmd -ci -nobl -restore -noBuild -projects src/Grpc/**/*.csproj
3737
displayName: Restore interop projects
3838
- script: ./build.cmd -ci -noRestore -test -all -noBuildJava -noBuildNative -projects eng\helix\helix.proj
3939
/p:RunQuarantinedTests=true /p:IsRequiredCheck=true /p:IsHelixJob=true /p:BuildInteropProjects=true

0 commit comments

Comments
 (0)