aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHoward Butler <howard@hobu.co>2020-03-02 15:10:06 -0600
committerHoward Butler <howard@hobu.co>2020-03-02 15:10:06 -0600
commit21a81035587750e7da79b0b77ca781a28ca9dc7a (patch)
treea40cfe57d1e93fc67de6ff1c702dfd3f91f699db
parentc961dc61de79a5e6066d1e12799fa28ac91a8ad9 (diff)
downloadPROJ-21a81035587750e7da79b0b77ca781a28ca9dc7a.tar.gz
PROJ-21a81035587750e7da79b0b77ca781a28ca9dc7a.zip
add osx builder
-rw-r--r--.azure-pipelines.yml1
-rw-r--r--scripts/azp/osx.yml62
-rw-r--r--scripts/azp/win.yml2
3 files changed, 65 insertions, 0 deletions
diff --git a/.azure-pipelines.yml b/.azure-pipelines.yml
index d8452d1b..1b373858 100644
--- a/.azure-pipelines.yml
+++ b/.azure-pipelines.yml
@@ -1,3 +1,4 @@
jobs:
- template: ./scripts/azp/linux.yml
- template: ./scripts/azp/win.yml
+ - template: ./scripts/azp/osx.yml
diff --git a/scripts/azp/osx.yml b/scripts/azp/osx.yml
new file mode 100644
index 00000000..b822175d
--- /dev/null
+++ b/scripts/azp/osx.yml
@@ -0,0 +1,62 @@
+# -*- mode: yaml -*-
+
+jobs:
+- job: osx
+ pool:
+ vmImage: macOS-10.14
+ steps:
+ - script: |
+ echo "Removing homebrew from Azure to avoid conflicts."
+ curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/uninstall > ~/uninstall_homebrew
+ chmod +x ~/uninstall_homebrew
+ ~/uninstall_homebrew -fq
+ rm ~/uninstall_homebrew
+ displayName: Remove homebrew
+ - bash: |
+ echo "##vso[task.prependpath]$CONDA/bin"
+ sudo chown -R $USER $CONDA
+ displayName: Add conda to PATH
+
+ - script: |
+ ECHO ON
+ source activate base
+ conda create --yes --quiet --name proj
+ displayName: Create conda environment
+
+ - script: |
+ ECHO ON
+ source activate proj
+ conda config --set always_yes True --set show_channel_urls True
+ conda config --add channels conda-forge
+ conda config --set channel_priority strict
+ conda install --yes --quiet --name proj curl cmake ninja libtiff sqlite conda-build ninja conda-forge-ci-setup=2 -y
+ displayName: Install PROJ dependencies
+ - script: |
+ source activate proj
+ export CI=azure
+ source run_conda_forge_build_setup
+ env: {
+ OSX_FORCE_SDK_DOWNLOAD: "1"
+ }
+ displayName: Configure OSX SDK
+ - script: |
+ source activate proj
+ echo "current directory:" `pwd`
+ mkdir build
+ cd build
+ cmake -G Ninja \
+ -DCMAKE_LIBRARY_PATH:FILEPATH="$CONDA_PREFIX/lib" \
+ -DCMAKE_INCLUDE_PATH:FILEPATH="$CONDA_PREFIX/include" \
+ ..
+ displayName: 'CMake'
+ - script: |
+ cd build
+ source activate proj
+ ninja
+ displayName: 'Build'
+ - script: |
+ cd build
+ source activate proj
+ ctest -V
+
+
diff --git a/scripts/azp/win.yml b/scripts/azp/win.yml
index 1d56546d..5b9f969a 100644
--- a/scripts/azp/win.yml
+++ b/scripts/azp/win.yml
@@ -32,6 +32,8 @@ jobs:
cmake -G "Ninja" ^
-DCMAKE_LIBRARY_PATH:FILEPATH="%CONDA_PREFIX%/Library/lib" ^
-DCMAKE_INCLUDE_PATH:FILEPATH="%CONDA_PREFIX%/Library/include" ^
+ -DCMAKE_C_FLAGS="/WX" \
+ -DCMAKE_CXX_FLAGS="/WX"
..
displayName: 'CMake'
- script: |