Merge pull request #1814 from Technius/ci/mac10.15

Fix MacOS build
presentation
Bryan Tan 6 years ago committed by GitHub
commit c22c51597f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 2
      azure-pipelines/continuous-integration.yml
  2. 4
      azure-pipelines/release.yml
  3. 7
      azure-pipelines/steps/build_mac.yml

@ -54,7 +54,7 @@ stages:
- job: macOS - job: macOS
pool: pool:
vmImage: 'macOS-10.13' vmImage: 'macOS-10.15'
displayName: 'Test Xournal++ on MacOS' displayName: 'Test Xournal++ on MacOS'
steps: steps:
- template: steps/build_mac.yml - template: steps/build_mac.yml

@ -114,14 +114,14 @@ stages:
- job: macOS - job: macOS
pool: pool:
vmImage: 'macOS-10.13' vmImage: 'macOS-10.15'
displayName: 'Build for macOS' displayName: 'Build for macOS'
condition: always() condition: always()
steps: steps:
- template: steps/build_mac.yml - template: steps/build_mac.yml
parameters: parameters:
build_type: 'RelWithDebInfo' build_type: 'RelWithDebInfo'
cmake_flags: '' cmake_flags: '-DCMAKE_OSX_DEPLOYMENT_TARGET=10.13'
- bash: | - bash: |
export PATH="$HOME/.local/bin:/Users/git-bin/gtk/inst/bin:$PATH" export PATH="$HOME/.local/bin:/Users/git-bin/gtk/inst/bin:$PATH"
./build-app.sh /Users/git-bin/gtk ./build-app.sh /Users/git-bin/gtk

@ -4,7 +4,8 @@ parameters:
steps: steps:
- bash: | - bash: |
ruby -e "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/uninstall)" # Ignore Homebrew uninstall errors
ruby -e "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/uninstall)" || true
displayName: 'Uninstall brew' displayName: 'Uninstall brew'
- bash: | - bash: |
cd /Users cd /Users
@ -33,7 +34,9 @@ steps:
unzip ninja-mac.zip -d /Users/git-bin/gtk/inst/bin unzip ninja-mac.zip -d /Users/git-bin/gtk/inst/bin
displayName: 'Get Ninja' displayName: 'Get Ninja'
- bash: | - bash: |
curl -L -o boost_1_72_0.tar.gz https://dl.bintray.com/boostorg/release/1.72.0/source/boost_1_72_0.tar.gz set -e
# Using SourceForge instead of bintray due to boostorg/boost#299
curl -L -o boost_1_72_0.tar.gz https://sourceforge.net/projects/boost/files/boost/1.72.0/boost_1_72_0.tar.gz/download
tar -xzf boost_1_72_0.tar.gz tar -xzf boost_1_72_0.tar.gz
cd boost_1_72_0 cd boost_1_72_0
./bootstrap.sh --prefix=/usr/local/boost-1.72.0 ./bootstrap.sh --prefix=/usr/local/boost-1.72.0

Loading…
Cancel
Save