Skip to content

Commit

Permalink
Re-enable Travis CI (#2286)
Browse files Browse the repository at this point in the history
Make changes to enable CI with alpine
  • Loading branch information
abellgithub committed Nov 28, 2018
1 parent dea1c46 commit fe87761
Show file tree
Hide file tree
Showing 6 changed files with 21 additions and 56 deletions.
9 changes: 6 additions & 3 deletions .travis.yml
Expand Up @@ -11,9 +11,12 @@ before_install:
script:
- docker run -v $TRAVIS_BUILD_DIR:/pdal -t pdal/alpinebase:latest /pdal/scripts/ci/script.sh

after_success:
- echo "secure travis:" "$TRAVIS_SECURE_ENV_VARS"
- sh -c 'if test "$TRAVIS_SECURE_ENV_VARS" = "true" -a "$TRAVIS_BRANCH" = "1.8-maintenance"; then echo "publish website"; ./scripts/ci/build_docs.sh; ./scripts/ci/add_deploy_key.sh; ./scripts/ci/deploy_website.sh $TRAVIS_BUILD_DIR/doc/build /tmp; fi'
after_success: |+
if [[ "$TRAVIS_SECURE_ENV_VARS" == "true" &&
"$TRAVIS_BRANCH" == "1.8-maintenance" ]]
then
./scripts/ci/after_success.sh $TRAVIS_BUILD_DIR
fi
notifications:
on_success: always
Expand Down
9 changes: 9 additions & 0 deletions scripts/ci/after_success.sh
@@ -0,0 +1,9 @@
#!/bin/bash

TRAVIS_BUILD_DIR=$1

echo "publishing website"

./build_docs.sh
./add_deploy_key.sh
./deploy_website.sh $TRAVIS_BUILD_DIR/doc/build /tmp
6 changes: 0 additions & 6 deletions scripts/ci/before_install.sh

This file was deleted.

31 changes: 0 additions & 31 deletions scripts/ci/common.sh

This file was deleted.

8 changes: 0 additions & 8 deletions scripts/ci/docker.sh

This file was deleted.

14 changes: 6 additions & 8 deletions scripts/ci/script.sh
Expand Up @@ -25,20 +25,18 @@ cmake .. \
-DWITH_LAZPERF=ON \
-DWITH_TESTS=ON

ninja
#LD_LIBRARY_PATH=./lib
ninja -v
ctest -V
make install
ninja install
cd /

# Python extension testing
pip install packaging
pip3 install packaging cython
git clone https://github.com/PDAL/python.git pdal-python
cd pdal-python
git checkout 2.0.0
python setup.py build
echo "current path: " `pwd`
export PDAL_TEST_DIR=/pdal/_build/test
python setup.py test
python3 setup.py build
PDAL_TEST_DIR=/pdal/_build/test python3 setup.py test

for EXAMPLE in writing writing-filter writing-kernel writing-reader writing-writer
do
Expand Down

0 comments on commit fe87761

Please sign in to comment.