Skip to content
This repository has been archived by the owner on May 7, 2022. It is now read-only.

Commit

Permalink
Merge pull request #9 from RebirthDB/next
Browse files Browse the repository at this point in the history
Making changes from next branch to 2.4 release branch
  • Loading branch information
atris authored Jul 2, 2018
2 parents d94d069 + 5ff63ad commit 38f2837
Show file tree
Hide file tree
Showing 754 changed files with 524 additions and 126,858 deletions.
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,8 @@ last_tested_versions
/**/run
/test_results.*

/vendored/

/windows_deps/
/x64/
/RethinkDB.sdf
Expand Down
30 changes: 30 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
language: cpp
sudo: required
dist: trusty
os:
- linux
notifications:
email:
- [email protected]
before_install:
- sudo apt-get -qq update
- sudo apt-get install mg
- sudo apt-get install build-essential protobuf-compiler python
- sudo apt-get install libprotobuf-dev libcurl4-openssl-dev libboost-all-dev
- sudo apt-get install libncurses5-dev libjemalloc-dev wget m4 g++

# Enable C++ support
language: cpp

# Compiler selection
compiler:
- gcc

# Build steps
install:
- ./configure --allow-fetch
- make -j8

script:
- make test
- ./build/release/rethinkdb-unittest
7 changes: 0 additions & 7 deletions admin/.gitignore

This file was deleted.

4 changes: 0 additions & 4 deletions admin/Makefile

This file was deleted.

Loading

0 comments on commit 38f2837

Please sign in to comment.