Skip to content

Commit

Permalink
put each step into its own script
Browse files Browse the repository at this point in the history
  • Loading branch information
hobu committed Sep 14, 2020
1 parent 3ae8bda commit b2ad6d8
Show file tree
Hide file tree
Showing 13 changed files with 124 additions and 89 deletions.
2 changes: 0 additions & 2 deletions .github/workflows/docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,6 @@ name: Docs
on:
push:
branches: '*'
pull_request:
branches: '*'

jobs:
docs:
Expand Down
47 changes: 10 additions & 37 deletions .github/workflows/unix.yml
Original file line number Diff line number Diff line change
@@ -1,10 +1,8 @@
name: Conda OSX and Linux
name: OSX and Linux

on:
push:
branches: '*'
pull_request:
branches: '*'

jobs:
build:
Expand All @@ -22,57 +20,32 @@ jobs:
with:
channels: conda-forge
auto-update-conda: true

- name: Setup
shell: bash -l {0}
run: |
conda install -c conda-forge pdal --only-deps -y
conda install -c conda-forge cmake ninja compilers -y
mkdir build
./scripts/ci/unix/setup.sh
- name: CMake
shell: bash -l {0}
run: |
cmake .. \
-G Ninja \
-DCMAKE_BUILD_TYPE=Debug \
-DCMAKE_INSTALL_PREFIX=`pwd`/../install \
-DBUILD_PLUGIN_I3S=ON \
-DBUILD_PLUGIN_NITF=ON \
-DBUILD_PLUGIN_TILEDB=ON \
-DBUILD_PLUGIN_ICEBRIDGE=ON \
-DBUILD_PLUGIN_HDF=ON \
-DBUILD_PLUGIN_PGPOINTCLOUD=ON \
-DBUILD_PLUGIN_E57=ON \
-DBUILD_PGPOINTCLOUD_TESTS=OFF \
-DWITH_LAZPERF=ON \
-DWITH_LASZIP=ON \
-DWITH_ZSTD=ON \
-DWITH_ZLIB=ON \
-DWITH_TESTS=ON
./scripts/ci/unix/cmake.sh
working-directory: ./build

- name: Compile
shell: bash -l {0}
run: |
ninja
ninja install
./scripts/ci/unix/compile.sh
working-directory: ./build

- name: Test
shell: bash -l {0}
run: |
ctest -V
./scripts/ci/unix/test.sh
working-directory: ./build

- name: Examples
shell: bash -l {0}
run: |
ctest -V
export BASE=`pwd`
for EXAMPLE in writing writing-filter writing-kernel \
writing-reader writing-writer
do
cd $BASE/examples/$EXAMPLE
mkdir -p _build || exit 1
cd _build || exit 1
cmake -G "Ninja" .. -DPDAL_DIR=$BASE/install/lib/cmake/PDAL && ninja
done
./scripts/ci/unix/examples.sh
57 changes: 7 additions & 50 deletions .github/workflows/win.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,64 +23,21 @@ jobs:
- name: Setup
shell: bash -l {0}
run: |
echo $PATH
pwd
where python
where cmake
conda install pdal --only-deps -y
conda install cmake ninja compilers -y
mkdir build
./scripts/ci/win/setup.sh
- name: CMake
shell: bash -l {0}
working-directory: ./build
run: |
pwd
where cl.exe
export CC=cl.exe
export CXX=cl.exe
cd build
cmake .. -G "Ninja" \
-DCMAKE_BUILD_TYPE=RelWithDebInfo \
-DCMAKE_INSTALL_PREFIX="$CONDA_PREFIX" \
-DWITH_TESTS=ON \
-DCMAKE_VERBOSE_MAKEFILE=OFF \
-DCMAKE_LIBRARY_PATH:FILEPATH="$CONDA_PREFIX/Library/lib" \
-DCMAKE_INCLUDE_PATH:FILEPATH="$CONDA_PREFIX/Library/include" \
-DOPENSSL_ROOT_DIR="$CONDA_PREFIX/Library" \
-DPython3_ROOT_DIR:FILEPATH="$CONDA_PREFIX" \
-DPython3_FIND_STRATEGY=LOCATION \
-DBUILD_PLUGIN_CPD=OFF \
-DBUILD_PLUGIN_ICEBRIDGE=ON \
-DBUILD_PLUGIN_HDF=ON \
-DBUILD_PLUGIN_MRSID=OFF \
-DBUILD_PLUGIN_NITF=ON \
-DBUILD_PLUGIN_PGPOINTCLOUD=ON \
-DBUILD_PLUGIN_OCI=OFF \
-DBUILD_PLUGIN_I3S=ON \
-DBUILD_PLUGIN_RIVLIB=OFF \
-DENABLE_CTEST=OFF \
-DWITH_LAZPERF=ON \
-DWITH_LZMA=ON \
-DLIBLZMA_LIBRARY:FILEPATH="$CONDA_PREFIX/Library/lib/liblzma.lib" \
-DWITH_LASZIP=ON \
-DLazperf_DIR:FILEPATH="$CONDA_PREFIX/Library/cmake" \
-DHDF5_DIR:FILEPATH="$CONDA_PREFIX/Library/cmake" \
-DLazperf_DIR:FILEPATH="$CONDA_PREFIX/Library/cmake" \
-DWITH_ZLIB=ON \
-Dgtest_force_shared_crt=ON \
-DBUILD_PGPOINTCLOUD_TESTS=OFF \
-DBUILD_I3S_TESTS=ON \
-DBUILD_OCI_TESTS=OFF
./scripts/ci/win/cmake.sh
- name: Compile
shell: bash -l {0}
working-directory: ./build
run: |
cd build
ninja -v
ninja install
./scripts/ci/win/compile.sh
- name: Test
shell: bash -l {0}
working-directory: ./build
run: |
cd build
ctest -VV --output-on-failure
./scripts/ci/win/test.sh
19 changes: 19 additions & 0 deletions scripts/ci/unix/cmake.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
#!/bin/bash

cmake .. \
-G Ninja \
-DCMAKE_BUILD_TYPE=Debug \
-DCMAKE_INSTALL_PREFIX=`pwd`/../install \
-DBUILD_PLUGIN_I3S=ON \
-DBUILD_PLUGIN_NITF=ON \
-DBUILD_PLUGIN_TILEDB=ON \
-DBUILD_PLUGIN_ICEBRIDGE=ON \
-DBUILD_PLUGIN_HDF=ON \
-DBUILD_PLUGIN_PGPOINTCLOUD=ON \
-DBUILD_PLUGIN_E57=ON \
-DBUILD_PGPOINTCLOUD_TESTS=OFF \
-DWITH_LAZPERF=ON \
-DWITH_LASZIP=ON \
-DWITH_ZSTD=ON \
-DWITH_ZLIB=ON \
-DWITH_TESTS=ON
4 changes: 4 additions & 0 deletions scripts/ci/unix/compile.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
#!/bin/bash

ninja
ninja install
11 changes: 11 additions & 0 deletions scripts/ci/unix/examples.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
#!/bin/bash

export BASE=`pwd`
for EXAMPLE in writing writing-filter writing-kernel \
writing-reader writing-writer
do
cd $BASE/examples/$EXAMPLE
mkdir -p _build || exit 1
cd _build || exit 1
cmake -G "Ninja" .. -DPDAL_DIR=$BASE/install/lib/cmake/PDAL && ninja
done
5 changes: 5 additions & 0 deletions scripts/ci/unix/setup.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
#!/bin/bash

conda install -c conda-forge pdal --only-deps -y
conda install -c conda-forge cmake ninja compilers -y
mkdir build
3 changes: 3 additions & 0 deletions scripts/ci/unix/test.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
#!/bin/bash

ctest -V
38 changes: 38 additions & 0 deletions scripts/ci/win/cmake.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
#!/bin/bash

pwd
where cl.exe
export CC=cl.exe
export CXX=cl.exe
cmake .. -G "Ninja" \
-DCMAKE_BUILD_TYPE=RelWithDebInfo \
-DCMAKE_INSTALL_PREFIX="$CONDA_PREFIX" \
-DWITH_TESTS=ON \
-DCMAKE_VERBOSE_MAKEFILE=OFF \
-DCMAKE_LIBRARY_PATH:FILEPATH="$CONDA_PREFIX/Library/lib" \
-DCMAKE_INCLUDE_PATH:FILEPATH="$CONDA_PREFIX/Library/include" \
-DOPENSSL_ROOT_DIR="$CONDA_PREFIX/Library" \
-DPython3_ROOT_DIR:FILEPATH="$CONDA_PREFIX" \
-DPython3_FIND_STRATEGY=LOCATION \
-DBUILD_PLUGIN_CPD=OFF \
-DBUILD_PLUGIN_ICEBRIDGE=ON \
-DBUILD_PLUGIN_HDF=ON \
-DBUILD_PLUGIN_MRSID=OFF \
-DBUILD_PLUGIN_NITF=ON \
-DBUILD_PLUGIN_PGPOINTCLOUD=ON \
-DBUILD_PLUGIN_OCI=OFF \
-DBUILD_PLUGIN_I3S=ON \
-DBUILD_PLUGIN_RIVLIB=OFF \
-DENABLE_CTEST=OFF \
-DWITH_LAZPERF=ON \
-DWITH_LZMA=ON \
-DLIBLZMA_LIBRARY:FILEPATH="$CONDA_PREFIX/Library/lib/liblzma.lib" \
-DWITH_LASZIP=ON \
-DLazperf_DIR:FILEPATH="$CONDA_PREFIX/Library/cmake" \
-DHDF5_DIR:FILEPATH="$CONDA_PREFIX/Library/cmake" \
-DLazperf_DIR:FILEPATH="$CONDA_PREFIX/Library/cmake" \
-DWITH_ZLIB=ON \
-Dgtest_force_shared_crt=ON \
-DBUILD_PGPOINTCLOUD_TESTS=OFF \
-DBUILD_I3S_TESTS=ON \
-DBUILD_OCI_TESTS=OFF
4 changes: 4 additions & 0 deletions scripts/ci/win/compile.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
#!/bin/bash

ninja -v
ninja install
11 changes: 11 additions & 0 deletions scripts/ci/win/examples.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
#!/bin/bash

export BASE=`pwd`
for EXAMPLE in writing writing-filter writing-kernel \
writing-reader writing-writer
do
cd $BASE/examples/$EXAMPLE
mkdir -p _build || exit 1
cd _build || exit 1
cmake -G "Ninja" .. -DPDAL_DIR=$BASE/install/lib/cmake/PDAL && ninja
done
9 changes: 9 additions & 0 deletions scripts/ci/win/setup.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
#!/bin/bash

echo $PATH
pwd
where python
where cmake
conda install pdal --only-deps -y
conda install cmake ninja compilers -y
mkdir build
3 changes: 3 additions & 0 deletions scripts/ci/win/test.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
#!/bin/bash

ctest -VV --output-on-failure

0 comments on commit b2ad6d8

Please sign in to comment.