Skip to content

Commit

Permalink
fixed/float build matrix for OSX and Windows
Browse files Browse the repository at this point in the history
  • Loading branch information
hobu committed Sep 15, 2020
1 parent 5e5a048 commit ec1fcab
Show file tree
Hide file tree
Showing 2 changed files with 37 additions and 6 deletions.
22 changes: 19 additions & 3 deletions scripts/ci/osx/setup.sh
Original file line number Diff line number Diff line change
@@ -1,6 +1,22 @@
#!/bin/bash

conda update -n base -c defaults conda
conda install pdal --only-deps -y
conda install cmake ninja compilers -y
echo "Configuring build type '$BUILD_TYPE'"
mkdir build

conda update -n base -c defaults conda
conda install cmake ninja conda-build compilers -y

if [ "$BUILD_TYPE" == "fixed" ]; then

conda config --set channel_priority strict
conda install --yes --quiet gdal=3.0.4=py38h9f7df5a_9 python=3.8 abseil-cpp -y
conda install --yes --quiet pdal --only-deps -y

else

conda install pdal --only-deps -y

fi

gdal-config --version

21 changes: 18 additions & 3 deletions scripts/ci/win/setup.sh
Original file line number Diff line number Diff line change
@@ -1,7 +1,22 @@
#!/bin/bash

echo "Configuring build type '$BUILD_TYPE'"
mkdir build

conda update -n base -c defaults conda
conda install pdal --only-deps -y
conda install cmake ninja compilers -y
conda install cmake ninja conda-build compilers -y

if [ "$BUILD_TYPE" == "fixed" ]; then

conda config --set channel_priority strict
conda install --yes --quiet gdal=3.0.4=py38h3ba59e7_9 python=3.8 abseil-cpp -y
conda install --yes --quiet pdal --only-deps -y

else

conda install pdal --only-deps -y

fi

gdal-config --version

mkdir build

0 comments on commit ec1fcab

Please sign in to comment.