File tree Expand file tree Collapse file tree 1 file changed +5
-1
lines changed
Expand file tree Collapse file tree 1 file changed +5
-1
lines changed Original file line number Diff line number Diff line change @@ -97,10 +97,14 @@ task:
9797 merge_script :
9898 -
git config --global user.email "[email protected] " 9999 - git config --global user.name "ci"
100+ # Windows filesystem loses the executable bit, and all of the executable
101+ # files are considered "modified" now. It will break the following `git merge`
102+ # command. The next two commands make git ignore this issue.
100103 - git config core.filemode false
101104 - git reset --hard
102105 - if ($env:CIRRUS_PR -eq $null) { exit 0; }
103106 - git fetch $env:CIRRUS_REPO_CLONE_URL $env:CIRRUS_BASE_BRANCH
107+ # Merge base to detect silent merge conflicts.
104108 - git merge FETCH_HEAD
105109 vcpkg_cache :
106110 folder : ' C:\Users\ContainerAdministrator\AppData\Local\vcpkg\archives'
@@ -138,7 +142,7 @@ task:
138142 - python build_msvc\msvc-autogen.py
139143 - msbuild build_msvc\bitcoin.sln -property:Configuration=Release -maxCpuCount -verbosity:minimal -noLogo
140144 unit_tests_script :
141- - src\test_bitcoin.exe
145+ - src\test_bitcoin.exe -l test_suite
142146 - src\bench_bitcoin.exe > $null
143147 - python test\util\test_runner.py
144148 - python test\util\rpcauth-test.py
You can’t perform that action at this time.
0 commit comments