Merge pull request #475 from OmniSharp/fix/master-xcode

Fix/master xcode
OmniSharp · Mar 24, 2016 · 56e3eea · 56e3eea
2 parents 2355041 + 39d7dfe
commit 56e3eea
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 10 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -9,10 +9,7 @@ mono:
 os:
   - linux
   - osx
-osx_image: xcode7.1
-matrix:
-  allow_failures:
-    - os: osx
+osx_image: xcode7.3
 before_install:
   - if [ "$TRAVIS_OS_NAME" == "osx" ]; then brew update; fi
   - if [ "$TRAVIS_OS_NAME" == "osx" ]; then brew install jq; fi
@@ -40,7 +37,7 @@ deploy:
   api_key:
     secure: N9hansErZKHl7G5Ed/hcBgwcvLuRjB7YAskAvSAYB+luacV6rSK7Vlm/4NyjaZCwWv5wOdBphle2S4yZLRDTdMwLrdQWwWYeZI60kE22c1amKJaf6j5ai2u/P3bt55klQ2yO2U/LacwHVoRtJlVdwSAXuDQ3zMd88VbBModQyxE=
   file_glob: true
-  file: artifacts/package/*.tar.gz
+  file: artifacts/package/*${TRAVIS_OS_NAME}*.tar.gz
   skip_cleanup: true
   on:
     repo: OmniSharp/omnisharp-roslyn

diff --git a/tools/PublishProject/Program.cs b/tools/PublishProject/Program.cs
@@ -81,11 +81,6 @@ private static void Package(string publishOutput,
                                     string framework)
         {
             var runtimeString = Regex.Replace(rid, "(\\d|\\.)*-", "-");
-
-            // Disable for now, while travis isn't working correctly.
-            if (PlatformServices.Default.Runtime.OperatingSystemPlatform == Platform.Darwin) {
-                return;
-            }
 
             // Simplify Ubuntu to Linux
             runtimeString = runtimeString.Replace("ubuntu", "linux");