Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update build.yml to use OSX 10.14 #874

Merged
merged 7 commits into from
Mar 7, 2020
Merged

Update build.yml to use OSX 10.14 #874

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
3233a88
Update build.yml
sywhang Mar 3, 2020
3875348
try xcode version 9.4.1
sywhang Mar 4, 2020
4746704
Try 10.3
sywhang Mar 5, 2020
529962b
Fix print statements in lldbhelper.py
sywhang Mar 6, 2020
a27df41
PR feedback
sywhang Mar 7, 2020
bb347fa
Merge branch 'master' into sywhang-patch-1
sywhang Mar 7, 2020
4b4f6de
try to fix build
sywhang Mar 7, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion eng/build.yml
View file
Open in desktop
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,7 @@ jobs:
condition: succeeded()

- ${{ if eq(parameters.osGroup, 'MacOS') }}:
- script: /bin/bash -c "sudo xcode-select -s /Applications/Xcode_10.3.app/Contents/Developer"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please condition this only to happen on public (the only one that uses that queue)

Suggested change
- script: /bin/bash -c "sudo xcode-select -s /Applications/Xcode_10.3.app/Contents/Developer"
- ${{ 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
View file
Open in desktop
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>")