highperfocused/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2025-06-09 14:41:42 +02:00
Code Issues Packages Projects Releases Wiki Activity

ci: Fix merge_script in MSVC task

Browse Source
This commit is contained in:
Hennadii Stepanov 2021-09-07 20:10:04 +03:00
parent ecf580e40f
commit f78cc90524
No known key found for this signature in database
GPG Key ID: 410108112E7EA81F
1 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
.cirrus.yml
View File

@ -96,17 +96,14 @@ task:
x64_NATIVE_TOOLS: '"C:\Program Files (x86)\Microsoft Visual Studio\2019\BuildTools\VC\Auxiliary\Build\vcvars64.bat"' x64_NATIVE_TOOLS: '"C:\Program Files (x86)\Microsoft Visual Studio\2019\BuildTools\VC\Auxiliary\Build\vcvars64.bat"'
IgnoreWarnIntDirInTempDetected: 'true' IgnoreWarnIntDirInTempDetected: 'true'
merge_script: merge_script:
- ps: git config --global user.email "ci@ci.ci" - git config --global user.email "ci@ci.ci"
- ps: git config --global user.name "ci" - git config --global user.name "ci"
# Windows filesystem loses the executable bit, and all of the executable # Windows filesystem loses the executable bit, and all of the executable
# files are considered "modified" now. It will break the following `git merge` # files are considered "modified" now. It will break the following `git merge`
# command. The next two commands make git ignore this issue. # command. The next two commands make git ignore this issue.
- ps: git config core.filemode false - git config core.filemode false
- ps: git reset --hard - git reset --hard
- ps: if ($env:CIRRUS_PR -eq $null) { exit 0; } - PowerShell -NoLogo -Command if ($env:CIRRUS_PR -ne $null) { git fetch $env:CIRRUS_REPO_CLONE_URL $env:CIRRUS_BASE_BRANCH; git merge FETCH_HEAD; }
- ps: git fetch $env:CIRRUS_REPO_CLONE_URL $env:CIRRUS_BASE_BRANCH
# Merge base to detect silent merge conflicts.
- ps: git merge FETCH_HEAD
msvc_qt_built_cache: msvc_qt_built_cache:
folder: "%QTBASEDIR%" folder: "%QTBASEDIR%"
reupload_on_changes: false reupload_on_changes: false