Skip to content

Commit

Permalink
Merge branch 'release-1.1.0'
Browse files Browse the repository at this point in the history
  • Loading branch information
jasonmp85 committed Mar 19, 2015
2 parents a25f873 + 6584e28 commit 3641ac4
Show file tree
Hide file tree
Showing 71 changed files with 7,604 additions and 806 deletions.
26 changes: 26 additions & 0 deletions .gitignore
Expand Up @@ -5,10 +5,18 @@
# Object files
*.o
*.ko
*.obj
*.elf

# Precompiled Headers
*.gch
*.pch

# Libraries
*.lib
*.a
*.la
*.lo

# Shared objects (inc. Windows DLLs)
*.dll
Expand All @@ -20,6 +28,19 @@
*.exe
*.out
*.app
*.i*86
*.x86_64
*.hex

# ========
# = Gcov =
# ========

# gcc coverage testing tool files

*.gcno
*.gcda
*.gcov

# ====================
# = Project-Specific =
Expand All @@ -30,3 +51,8 @@
# Generated test files
/expected/connection.out
/sql/connection.sql
/expected/create_shards.out
/sql/create_shards.sql
/expected/repair_shards.out
/sql/repair_shards.sql
/expected/modifications.out
21 changes: 21 additions & 0 deletions .travis.yml
@@ -0,0 +1,21 @@
language: c
cache: apt
env:
global:
- enable_coverage=yes
matrix:
- PGVERSION=9.3
- PGVERSION=9.4
before_install:
- sudo apt-get update -qq
- sudo update-alternatives --remove-all postmaster.1.gz
- git clone --depth 1 https://gist.github.com/9963879.git tools
- tools/nuke_pg.sh
install:
- sudo pip install cpp-coveralls
- tools/install_pg.sh
before_script: tools/config_and_start_cluster.sh
script: tools/pg_travis_test.sh
after_success:
- sudo chmod 666 *.gcda
- coveralls --exclude test --exclude ruleutils_93.c --exclude ruleutils_94.c

0 comments on commit 3641ac4

Please sign in to comment.