From 6851fe374c10e5d5686f63843119cabdb6fe4dd0 Mon Sep 17 00:00:00 2001 From: Andrew Schwartzmeyer Date: Wed, 13 Apr 2016 22:21:16 -0700 Subject: [PATCH] Enable OS X on Travis Remove unsupported osx.10.10-x64 moniker. Use `osx_image: xcode7.3` to get an OS X 10.11 image on Travis. --- .travis.yml | 7 ++++--- PowerShellGitHubDev.psm1 | 1 - src/Microsoft.PowerShell.CoreConsoleHost/project.json | 1 - 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index 90817fd1c5..e77c8b6dfa 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,9 +4,10 @@ matrix: - os: linux dist: trusty sudo: required - # - os: osx - # language: generic - # env: PATH+=/usr/local/share/dotnet + - os: osx + osx_image: xcode7.3 + language: generic + env: PATH+=/usr/local/share/dotnet git: submodules: false before_install: diff --git a/PowerShellGitHubDev.psm1 b/PowerShellGitHubDev.psm1 index e8b6d82440..adbafb16c7 100644 --- a/PowerShellGitHubDev.psm1 +++ b/PowerShellGitHubDev.psm1 @@ -36,7 +36,6 @@ function Start-PSBuild { "win7-x64", "win81-x64", "win10-x64", - "osx.10.10-x64", "osx.10.11-x64")] [Parameter(ParameterSetName='CoreCLR')] [string]$Runtime, diff --git a/src/Microsoft.PowerShell.CoreConsoleHost/project.json b/src/Microsoft.PowerShell.CoreConsoleHost/project.json index 22edf8af03..38d8a483a4 100644 --- a/src/Microsoft.PowerShell.CoreConsoleHost/project.json +++ b/src/Microsoft.PowerShell.CoreConsoleHost/project.json @@ -37,7 +37,6 @@ "win7-x64": { }, "win81-x64": { }, "win10-x64": { }, - "osx.10.10-x64": { }, "osx.10.11-x64": { } } }