From 8ec806995e4ceb6a7c4f31a85704873949d8c9ff Mon Sep 17 00:00:00 2001 From: mhenrixon Date: Tue, 2 Jun 2020 19:05:20 +0200 Subject: [PATCH 1/4] Move dev-gems from gemspec to gemfile No need managing them in the gemspec (complicated). --- Gemfile | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/Gemfile b/Gemfile index 0163d8488..6a79587d3 100644 --- a/Gemfile +++ b/Gemfile @@ -5,8 +5,17 @@ gemspec LOCAL_GEMS = "Gemfile.local" -gem "appraisal", ">= 2.2" -gem "rspec-its", require: false +gem "appraisal" +gem "bundler" +gem "gem-release" +gem "github-markup" +gem "rack-test" +gem "rake" +gem "rspec" +gem "rspec-its" +gem "sinatra" +gem "timecop" +gem "yard" platforms :mri do gem "fasterer" From 4b9b315a037c53f1b3465c9eacc277eb4756dab6 Mon Sep 17 00:00:00 2001 From: mhenrixon Date: Tue, 2 Jun 2020 19:13:33 +0200 Subject: [PATCH 2/4] Attempt to coverage --- .github/workflows/rspec.yml | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/.github/workflows/rspec.yml b/.github/workflows/rspec.yml index 44fb37eb0..b13b8d270 100644 --- a/.github/workflows/rspec.yml +++ b/.github/workflows/rspec.yml @@ -1,6 +1,21 @@ name: RSpec on: [push] jobs: + coverage: + steps: + - uses: actions/checkout@v2 + - uses: ruby/setup-ruby@v1 + with: + ruby-version: 2.6.5 + - run: bundle install --jobs=$(nproc) --retry=$(nproc) + - name: Coverage + uses: paambaati/codeclimate-action@v2.6.0 + env: + COV: true + CC_TEST_REPORTER_ID: 88e524e8f638efe690def7a6e2c72b1a9db5cdfa74548921b734d609a5858ee5 + with: + coverageCommand: bin/rspec --require spec_helper --tag ~perf + debug: true tests: env: COV: false From da3de471bf037d21e6cf40ae1e8b4ceba4d44a09 Mon Sep 17 00:00:00 2001 From: mhenrixon Date: Tue, 2 Jun 2020 19:13:55 +0200 Subject: [PATCH 3/4] Remove travis --- .travis.yml | 71 ----------------------------------------------------- 1 file changed, 71 deletions(-) delete mode 100644 .travis.yml diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index 56ea225c5..000000000 --- a/.travis.yml +++ /dev/null @@ -1,71 +0,0 @@ -env: - matrix: - - COV=false - global: - - CC_TEST_REPORTER_ID=88e524e8f638efe690def7a6e2c72b1a9db5cdfa74548921b734d609a5858ee5 - - GIT_COMMITTED_AT=$(if [ "$TRAVIS_PULL_REQUEST" == "false" ]; then git log -1 --pretty=format:%ct; else git log -1 --skip 1 --pretty=format:%ct; fi) -dist: bionic -sudo: required -language: ruby -cache: - bundler: true - directories: - - /home/travis/.rvm/ -services: - - redis-server - -before_install: - - gem update bundler - - > - if [[ "${COV}" = "true" ]]; then - curl -L https://codeclimate.com/downloads/test-reporter/test-reporter-latest-linux-amd64 > ./cc-test-reporter; - chmod +x ./cc-test-reporter; - fi; - -before_script: - - if [[ "${COV}" = "true" ]]; then ./cc-test-reporter before-build; fi; - -script: - - > - if [[ "${COV}" = "true" ]]; then - bundle exec rubocop -P; - bundle exec reek .; - fi; - bundle exec rspec --require spec_helper --tag ~perf - -after_script: - - if [[ "${COV}" = "true" ]]; then ./cc-test-reporter after-build --exit-code $TRAVIS_TEST_RESULT; fi; - -rvm: - - 2.5.7 - -matrix: - fast_finish: true - - include: - - rvm: jruby-9.2.11.1 - gemfile: gemfiles/sidekiq_6.0.gemfile - - rvm: 2.6.5 - gemfile: gemfiles/sidekiq_6.0.gemfile - env: COV=true - -gemfile: - - gemfiles/sidekiq_4.0.gemfile - - gemfiles/sidekiq_4.1.gemfile - - gemfiles/sidekiq_4.2.gemfile - - gemfiles/sidekiq_5.0.gemfile - - gemfiles/sidekiq_5.1.gemfile - - gemfiles/sidekiq_5.2.gemfile - - gemfiles/sidekiq_6.0.gemfile - - gemfiles/sidekiq_develop.gemfile - -notifications: - email: - recipients: - - mikael@mhenrixon.com - slack: - rooms: - secure: B05ZUPdHrhxVnz7Mlpd5KhFH2bdE9ykFRgqLFHV3EcdyWKm85PPgbfl4cNPTFXHHhzk/5E9h5hwEXpicJYSsq6lhU8i3WesidrA+GHzrpesowTHpvtJMxIjsE1Tavug0xQs/bca72yN2t51m8UiD1scOSIuvSOCNkuKkn3+rSIo= - on_start: never - on_failure: always - on_success: change From 99bd834e797466a9879ef44280a36023c75b3df0 Mon Sep 17 00:00:00 2001 From: mhenrixon Date: Tue, 2 Jun 2020 19:34:35 +0200 Subject: [PATCH 4/4] Add services and OS --- .github/workflows/rspec.yml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/.github/workflows/rspec.yml b/.github/workflows/rspec.yml index b13b8d270..9b6170455 100644 --- a/.github/workflows/rspec.yml +++ b/.github/workflows/rspec.yml @@ -2,6 +2,14 @@ name: RSpec on: [push] jobs: coverage: + services: + redis: + image: redis:latest + ports: + - 6379:6379 + + runs-on: ubuntu-latest + steps: - uses: actions/checkout@v2 - uses: ruby/setup-ruby@v1