repo: Fix Travis CI job for MacOS

A change in the MacOS images caused a conflict when upgrading python3.
This change removes oclint first, since that package is the source of
the conflict

Change-Id: I990a7b0eb1f91f51fcc2ad2a0db120af49c7a754

diff --git a/.travis.yml b/.travis.yml
index 7305c6a615f8580623b8841a056f28897c38ec73..e28934305ba33dbce361167aa98238383f7b7842 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -52,7 +52,9 @@ before_install:
     fi
   - |
     if [[ "$VULKAN_BUILD_TARGET" == "MACOS" ]]; then
-      # Install the appropriate MacOS packages
+      # We need to uninstall oclint or we get a gcc conflict when upgrading python
+      brew cask uninstall oclint
+      # We need to upgrade to a newer python
       brew upgrade python3
     fi
   - |