Skip to content

Commit

Permalink
Update build.yml to use OSX 10.14 (#874)
Browse files Browse the repository at this point in the history
* Update build.yml

* try xcode version 9.4.1

* Try 10.3

* Fix print statements in lldbhelper.py

* PR feedback

* try to fix build
  • Loading branch information
sywhang authored Mar 7, 2020
1 parent a9cc91d commit ebfdcd8
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 6 deletions.
4 changes: 3 additions & 1 deletion eng/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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')) }}:
Expand Down Expand Up @@ -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)
Expand Down
10 changes: 5 additions & 5 deletions src/SOS/SOS.UnitTests/Scripts/lldbhelper.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

def __lldb_init_module(debugger, internal_dict):
debugger.HandleCommand('command script add -f lldbhelper.runcommand runcommand')
print "<END_COMMAND_OUTPUT>"
print("<END_COMMAND_OUTPUT>")

def runcommand(debugger, command, result, internal_dict):
interpreter = debugger.GetCommandInterpreter()
Expand All @@ -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 "<END_COMMAND_OUTPUT>"
print("<END_COMMAND_OUTPUT>")
else:
print "<END_COMMAND_ERROR>"
print("<END_COMMAND_ERROR>")

0 comments on commit ebfdcd8

Please sign in to comment.