Przeglądaj źródła

CI: Fix some macOS build settings

Colin Edwards 5 lat temu
rodzic
commit
91d5a9c895
2 zmienionych plików z 2 dodań i 3 usunięć
  1. 1 2
      CI/install-dependencies-osx.sh
  2. 1 1
      azure-pipelines.yml

+ 1 - 2
CI/install-dependencies-osx.sh

@@ -12,8 +12,6 @@ set -v
 
 if [[ $TRAVIS ]]; then
   git fetch --unshallow
-else
-  /bin/bash -c "sudo xcode-select -s /Applications/Xcode_9.4.1.app/Contents/Developer"
 fi
 
 git fetch origin --tags
@@ -32,6 +30,7 @@ brew update
 #Base OBS Deps and ccache
 brew install jack speexdsp ccache mbedtls clang-format freetype fdk-aac
 brew install https://gist.githubusercontent.com/DDRBoxman/b3956fab6073335a4bf151db0dcbd4ad/raw/ed1342a8a86793ea8c10d8b4d712a654da121ace/qt.rb
+brew unlink swig
 brew install https://gist.githubusercontent.com/DDRBoxman/4cada55c51803a2f963fa40ce55c9d3e/raw/572c67e908bfbc1bcb8c476ea77ea3935133f5b5/swig.rb
 
 pip install dmgbuild

+ 1 - 1
azure-pipelines.yml

@@ -30,7 +30,7 @@ jobs:
   variables:
     prHasCILabel: $[ dependencies.Prebuild.outputs['checkPrLabel.prHasCILabel'] ]
   pool:
-    vmImage: 'macos-10.13'
+    vmImage: 'macOS-10.15'
   steps:
   - script: git submodule update --init --recursive
     displayName: 'Checkout Submodules'