From ebfdcd86d90f6efacb81af7f7b4f4a1e840f01b9 Mon Sep 17 00:00:00 2001 From: Sung Yoon Whang Date: Fri, 6 Mar 2020 20:28:44 -0800 Subject: [PATCH] Update build.yml to use OSX 10.14 (#874) * Update build.yml * try xcode version 9.4.1 * Try 10.3 * Fix print statements in lldbhelper.py * PR feedback * try to fix build --- eng/build.yml | 4 +++- src/SOS/SOS.UnitTests/Scripts/lldbhelper.py | 10 +++++----- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/eng/build.yml b/eng/build.yml index a5c61a96f5..c51ac37d1a 100644 --- a/eng/build.yml +++ b/eng/build.yml @@ -56,7 +56,7 @@ jobs: # Official Build OSX Pool ${{ if and(eq(parameters.osGroup, 'MacOS'), eq(variables['System.TeamProject'], 'public')) }}: - vmImage: macOS-10.13 + vmImage: macOS-10.14 # Official Build Windows Pool ${{ if and(eq(parameters.osGroup, 'Windows_NT'), ne(variables['System.TeamProject'], 'public')) }}: @@ -136,6 +136,8 @@ jobs: condition: succeeded() - ${{ if eq(parameters.osGroup, 'MacOS') }}: + - ${{ if eq(variables['System.TeamProject'], 'public') }}: + - script: /bin/bash -c "sudo xcode-select -s /Applications/Xcode_10.3.app/Contents/Developer" - script: $(Build.SourcesDirectory)/eng/cibuild.sh --configuration $(_BuildConfig) --architecture $(_BuildArch) diff --git a/src/SOS/SOS.UnitTests/Scripts/lldbhelper.py b/src/SOS/SOS.UnitTests/Scripts/lldbhelper.py index 47581bcdda..6b3326a2b2 100644 --- a/src/SOS/SOS.UnitTests/Scripts/lldbhelper.py +++ b/src/SOS/SOS.UnitTests/Scripts/lldbhelper.py @@ -2,7 +2,7 @@ def __lldb_init_module(debugger, internal_dict): debugger.HandleCommand('command script add -f lldbhelper.runcommand runcommand') - print "" + print("") def runcommand(debugger, command, result, internal_dict): interpreter = debugger.GetCommandInterpreter() @@ -11,12 +11,12 @@ def runcommand(debugger, command, result, internal_dict): interpreter.HandleCommand(command, commandResult) if commandResult.GetOutputSize() > 0: - print commandResult.GetOutput() + print(commandResult.GetOutput()) if commandResult.GetErrorSize() > 0: - print commandResult.GetError() + print(commandResult.GetError()) if commandResult.Succeeded(): - print "" + print("") else: - print "" + print("")