Skip to content

Commit 20b921a

Browse files
committed
utils: invoke update-checkout with --reset-to-remote
This should hopefully prevent unstaged change errors in CI.
1 parent 0c957a2 commit 20b921a

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

utils/build-windows-toolchain.bat

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -792,7 +792,7 @@ set "args=%args% --skip-repository swift-integration-tests"
792792
set "args=%args% --skip-repository swift-stress-tester"
793793
set "args=%args% --skip-repository swift-xcode-playground-support"
794794

795-
call "%SourceRoot%\swift\utils\update-checkout.cmd" %args% --clone --skip-history --github-comment "%ghprbCommentBody%"
795+
call "%SourceRoot%\swift\utils\update-checkout.cmd" %args% --clone --reset-to-remote --skip-history --github-comment "%ghprbCommentBody%"
796796

797797
goto :eof
798798
endlocal

utils/build-windows.bat

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@ git -C "%source_root%\swift" checkout-index --force --all
134134
@set "skip_repositories_arg=%skip_repositories_arg% --skip-repository tensorflow-swift-apis"
135135
@set "skip_repositories_arg=%skip_repositories_arg% --skip-repository yams"
136136

137-
call "%source_root%\swift\utils\update-checkout.cmd" %scheme_arg% %skip_repositories_arg% --clone --skip-history --skip-tags --github-comment "%ghprbCommentBody%" >NUL
137+
call "%source_root%\swift\utils\update-checkout.cmd" %scheme_arg% %skip_repositories_arg% --clone --reset-to-remote --skip-history --skip-tags --github-comment "%ghprbCommentBody%" >NUL
138138

139139
goto :eof
140140
endlocal

0 commit comments

Comments
 (0)