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

Add build config and tools #107

Merged
merged 3 commits into from
Mar 8, 2020
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
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
5 changes: 5 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,11 @@ coverage
webhook.lock
vendor/

# Vanagon/Build files
vanagon_hosts.log
ext/
output/

# SQLite Databases
**/*.sqlite
**/*.sqlite3
Expand Down
2 changes: 1 addition & 1 deletion .rubocop.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
AllCops:
TargetRubyVersion: 2.2
TargetRubyVersion: 2.5
Exclude:
- 'vendor/**/*'
- 'db/schema.rb'
Expand Down
13 changes: 5 additions & 8 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,7 @@ language: ruby
cache: bundler
dist: trusty
before_install:
- bundle -v
- gem install bundler -v 1.17.1
- gem install bundler:2.1.4
bastelfreak marked this conversation as resolved.
Show resolved Hide resolved
- bundle -v
before_script:
- cp ./config/config.yml.example ./config/config.yml
Expand All @@ -14,19 +13,17 @@ before_script:
- ./cc-test-reporter before-build
- 'bundle exec rake db:migrate SINATRA_ENV=test'
script:
- 'bundle exec rake $CHECK'
- 'bundle exec rspec'
Copy link
Member

Choose a reason for hiding this comment

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

does this make sense? Later on we set env: CHECK=test

Copy link
Member Author

Choose a reason for hiding this comment

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

We currently only have one check that we run on different ruby versions. I can remove the $CHECK

Copy link
Member

Choose a reason for hiding this comment

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

I think that makes sense. the travis config currently references the rake tasks rspec, test and test_and_report_coverage

Copy link
Member Author

Choose a reason for hiding this comment

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

Ahh, test runs both rubocop and rspec. Probably should run rubocop as a standalone test

after_script:
- if [ "$CHECK" == "test_and_report_coverage" ] && [ "$TRAVIS_PULL_REQUEST" == "false" ]; then ./cc-test-reporter after-build --exit-code $TRAVIS_TEST_RESULT; fi
matrix:
fast_finish: true
include:
- rvm: 2.4.5
env: CHECK=test
- rvm: 2.5.3
- rvm: 2.5.5
env: CHECK=test
- rvm: 2.6.0
- rvm: 2.6.5
env: CHECK=test
- rvm: 2.4.2
- rvm: 2.5.3
env: CHECK=test_and_report_coverage
branches:
only:
Expand Down
50 changes: 28 additions & 22 deletions Gemfile
Original file line number Diff line number Diff line change
@@ -1,41 +1,47 @@
source 'https://rubygems.org'

gem 'sinatra'
gem 'sinatra-contrib'
# gem 'sinatra-authentication'
gem 'activerecord', '4.2.11', require: 'active_record'
gem 'bcrypt'
gem 'github_changelog_generator'
gem 'mcollective-client'
gem 'puma'
gem 'puppet_forge', '2.2.8'
gem 'r10k'
gem 'rake'
gem 'require_all'
gem 'rocket-chat-notifier'
gem 'shotgun'
gem 'sidekiq'
gem 'sinatra-activerecord', require: 'sinatra/activerecord'
gem 'slack-notifier'
gem 'sqlite3', '1.3.13'
gem 'thin'
gem 'tux'
gem 'warden'
group :default do
gem 'sinatra'
gem 'sinatra-contrib'
# gem 'sinatra-authentication'
gem 'activerecord', '4.2.11', require: 'active_record'
gem 'bcrypt'
gem 'github_changelog_generator'
gem 'mcollective-client'
gem 'puma'
gem 'puppet_forge', '2.2.8'
gem 'rb-readline'
gem 'r10k'
gem 'rake'
gem 'require_all'
gem 'rocket-chat-notifier'
gem 'shotgun'
gem 'sidekiq', '< 6.0.0'
gem 'sinatra-activerecord', require: 'sinatra/activerecord'
gem 'slack-notifier'
gem 'sqlite3', '1.3.13'
gem 'thin'
gem 'tux'
gem 'warden'
end

group :development do
gem 'debase'
gem 'fustigit'
gem 'pry'
gem 'pry-byebug'
gem 'rack-console'
gem 'rubocop'
gem 'ruby-debug-ide'
gem 'ruby-git'
gem 'vanagon', '0.15.25'
gem 'yard', '>= 0.9.20'
end

group :test do
gem 'capybara'
gem 'database_cleaner-active_record'
gem 'coveralls'
gem 'database_cleaner', git: 'https://github.com/bmabey/database_cleaner.git'
gem 'rack-test'
gem 'rspec'
gem 'simplecov'
Expand Down
Loading