Skip to content

Commit

Permalink
Merge pull request #924 from pgRouting/release/2.5
Browse files Browse the repository at this point in the history
Pre-Release/2.5.0-alpha
  • Loading branch information
cvvergara authored Aug 23, 2017
2 parents b4c291b + 9956023 commit 8fecd35
Show file tree
Hide file tree
Showing 2,156 changed files with 393,273 additions and 150,203 deletions.
4 changes: 3 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,11 @@ build
fix_typos
code_linter

tools/template/mycreate.sh
*.sh
.DS_Store
.vagrant
tools/vagrant/packaging.sh
*.mo
tools/testers/pg_prove_dijkstraTRSP_tests.sh
.directory
notUsed
6 changes: 3 additions & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# ------------------------------------------------------------------------------
# Travis CI scripts
# Travis CI scripts
# Copyright(c) pgRouting Contributors
#
# Main configuration
Expand Down Expand Up @@ -71,12 +71,12 @@ before_script:
- ./tools/travis/check-extensions.sh $POSTGRESQL_VERSION ___pgr___test___


script:
script:
- ./tools/travis/pgrouting_build.sh $POSTGRESQL_VERSION $POSTGIS_VERSION
# tests as part of script so if a test fails the build fails
- ./tools/testers/pg_prove_tests.sh $PG_USER DEBUG

after_script:
#after_script:
- ./tools/travis/pgrouting_test.sh $POSTGRESQL_VERSION $PG_USER -ignorenotice

#after_success:
Expand Down
Loading

0 comments on commit 8fecd35

Please sign in to comment.