para/GSL
1
0
Fork 0
mirror of https://github.com/microsoft/GSL.git synced 2024-11-03 17:56:43 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Add logging

Browse Source
This commit is contained in:
Daniel Donenfeld 2019-02-26 18:02:03 -08:00
parent adffa26f25
commit 560a596cf8
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
appveyor.yml
View File

@ -7,7 +7,7 @@ skip_branch_with_pr: true
platform: platform:
- x86 - x86
- x64 # - x64
configuration: configuration:
# - Debug # - Debug

4
asm/scripts/deploy-asm.ps1
View File

@ -21,6 +21,10 @@ function collectAsm {
#Only merge in asm if there is any change between the current branch and the final asm branch #Only merge in asm if there is any change between the current branch and the final asm branch
cmd.exe /c "git diff --quiet origin/$($branchName)..$($asmFinalBranch)" cmd.exe /c "git diff --quiet origin/$($branchName)..$($asmFinalBranch)"
if(-not $?){ if(-not $?){
#TEMPORARY LOGGING:
Write-Host "Diffs from $($branchName), cherry-picking into asm final branch $($asmFinalBranch)"
cmd.exe /c "git diff origin/$($branchName)..$($asmFinalBranch)"
# Use cherry-pick as the asm branches only have a single commit # Use cherry-pick as the asm branches only have a single commit
cmd.exe /c "git cherry-pick origin/$($branchName) --allow-empty 2>&1" cmd.exe /c "git cherry-pick origin/$($branchName) --allow-empty 2>&1"
if(-not $?){ if(-not $?){