From e30f1433fb2dcf99c8729f749be07337be5b5c48 Mon Sep 17 00:00:00 2001 From: Andrew Tomaka Date: Mon, 9 Apr 2018 22:46:27 -0400 Subject: [PATCH] Clean up CI/CD --- .rubocop.yml | 1 + .travis.yml | 8 ++++++++ Gemfile.lock | 38 +++++++++++++++++++------------------- 3 files changed, 28 insertions(+), 19 deletions(-) diff --git a/.rubocop.yml b/.rubocop.yml index 7f5eb68..e94ee3a 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -1,6 +1,7 @@ AllCops: Exclude: - db/schema.rb + - vendor/**/* Metrics/LineLength: Description: 'Limit lines to 80 characters.' diff --git a/.travis.yml b/.travis.yml index 06bf19c..0396cef 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,5 +1,13 @@ sudo: false +cache: bundler language: ruby rvm: - 2.4.2 before_install: gem install bundler -v 1.16.1 + +jobs: + include: + - stage: analyze + script: bundle exec rubocop + - stage: test + script: bundle exec rspec diff --git a/Gemfile.lock b/Gemfile.lock index 73b5096..4e0e62a 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,42 +1,42 @@ PATH remote: . specs: - psenv (0.2.0) + psenv (0.2.1) aws-sdk-ssm (~> 1) - psenv-rails (0.2.0) - psenv (= 0.2.0) + psenv-rails (0.2.1) + psenv (= 0.2.1) railties (>= 3.2, < 5.2) GEM remote: https://rubygems.org/ specs: - actionpack (5.1.5) - actionview (= 5.1.5) - activesupport (= 5.1.5) + actionpack (5.1.6) + actionview (= 5.1.6) + activesupport (= 5.1.6) rack (~> 2.0) rack-test (>= 0.6.3) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.0.2) - actionview (5.1.5) - activesupport (= 5.1.5) + actionview (5.1.6) + activesupport (= 5.1.6) builder (~> 3.1) erubi (~> 1.4) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.0.3) - activesupport (5.1.5) + activesupport (5.1.6) concurrent-ruby (~> 1.0, >= 1.0.2) - i18n (~> 0.7) + i18n (>= 0.7, < 2) minitest (~> 5.1) tzinfo (~> 1.1) addressable (2.5.2) public_suffix (>= 2.0.2, < 4.0) ast (2.4.0) - aws-partitions (1.74.0) - aws-sdk-core (3.18.0) + aws-partitions (1.79.0) + aws-sdk-core (3.19.0) aws-partitions (~> 1.0) aws-sigv4 (~> 1.0) jmespath (~> 1.0) - aws-sdk-ssm (1.8.0) + aws-sdk-ssm (1.10.0) aws-sdk-core (~> 3) aws-sigv4 (~> 1.0) aws-sigv4 (1.0.2) @@ -45,13 +45,13 @@ GEM concurrent-ruby (1.0.5) crack (0.4.3) safe_yaml (~> 1.0.0) - crass (1.0.3) + crass (1.0.4) diff-lcs (1.3) erubi (1.7.1) hashdiff (0.3.7) - i18n (0.9.5) + i18n (1.0.0) concurrent-ruby (~> 1.0) - jmespath (1.3.1) + jmespath (1.4.0) loofah (2.2.2) crass (~> 1.0.2) nokogiri (>= 1.5.9) @@ -76,9 +76,9 @@ GEM nokogiri (>= 1.6) rails-html-sanitizer (1.0.4) loofah (~> 2.2, >= 2.2.2) - railties (5.1.5) - actionpack (= 5.1.5) - activesupport (= 5.1.5) + railties (5.1.6) + actionpack (= 5.1.6) + activesupport (= 5.1.6) method_source rake (>= 0.8.7) thor (>= 0.18.1, < 2.0)