diff --git a/appveyor.yml b/appveyor.yml index de39526..aaa9552 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -7,7 +7,7 @@ skip_branch_with_pr: true platform: - x86 - - x64 + # - x64 configuration: # - Debug diff --git a/asm/scripts/deploy-asm.ps1 b/asm/scripts/deploy-asm.ps1 index 7a8c758..2cdfcf3 100644 --- a/asm/scripts/deploy-asm.ps1 +++ b/asm/scripts/deploy-asm.ps1 @@ -21,6 +21,10 @@ function collectAsm { #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)" 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 cmd.exe /c "git cherry-pick origin/$($branchName) --allow-empty 2>&1" if(-not $?){