Skip to content
This repository was archived by the owner on Jul 24, 2020. It is now read-only.

Merge #235 - Travis CI implementation #641

Merged
merged 8 commits into from
Jul 8, 2014
Merged

Merge #235 - Travis CI implementation #641

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
c1a4c8e
setup Travis CI #235
Jul 7, 2014
ca2df70
setup database.yml for travis ci, fix double rake gem issue
Jul 8, 2014
083d328
sets up database before building
Jul 8, 2014
245a627
adds bundle exec
Jul 8, 2014
8fb8171
remove commented out test from gemfile
Jul 8, 2014
3f58996
adds comment clarifying purpose of database.travis.yml
Jul 8, 2014
29ce74d
adds code climate token
Jul 8, 2014
e5274ae
new approach to environment setup
Jul 8, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
language: ruby
rvm:
- 2.1.1
- 1.9.3
before_script:
- cp config/database.travis.yml config/database.yml
- bundle exec rake db:setup
4 changes: 4 additions & 0 deletions Gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,3 +90,7 @@ group :production, :staging do
gem 'therubyracer', require: 'v8'
gem 'airbrake'
end

# group :test do
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

is this a placeholder for #598?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oh that was a test, sorry, I can get rid of that.

# gem 'rake'
# end
30 changes: 30 additions & 0 deletions config/database.travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
development:
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this file should be added to the git-ignore file, and copied to a database.travis.yml.example file (just like database.yml), and this info added to appropriate documentation. database setups will vary and we don't want to assume mysql2 with these default settings. :)

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Unfortunately that's not how it works. This file is for Travis CI's VMs, and is necessary for automatic builds. There can't be a .example file because this isn't for human setup, it's only for Travis CI.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ah, I see, I didn't realize Travis CI is a hosted service and doesn't use our databases. Can we add that to a comment in the top line, for documentation/clarity?

adapter: mysql2
encoding: utf8
reconnect: false
database: reservations_development
pool: 5
username: root
password:
host: localhost

# Warning: The database defined as "test" will be erased and
# re-generated from your development database when you run "rake".
# Do not set this db to the same as development or production.
test:
adapter: mysql2
encoding: utf8
reconnect: false
database: reservations_test
pool: 5
username: root
password:

production:
adapter: mysql2
encoding: utf8
reconnect: false
database: reservations_production
pool: 5
username: root
password: