diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index bf8f260..de2b833 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -8,26 +8,17 @@ jobs: fail-fast: false matrix: os: [ ubuntu-latest ] - ruby: [ 2.6, 2.7 ] + ruby: [ 3.1, 3.2 ] runs-on: ${{ matrix.os }} env: CI: true steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - uses: ruby/setup-ruby@v1 with: ruby-version: ${{ matrix.ruby }} - - uses: actions/cache@v1 - with: - path: vendor/bundle - key: bundle-use-ruby-${{ matrix.os }}-${{ matrix.ruby }}-${{ hashFiles('**/Gemfile.lock') }} - restore-keys: | - bundle-use-ruby-${{ matrix.os }}-${{ matrix.ruby }}- + bundler-cache: true - run: sudo apt-get install libsqlite3-dev - - name: bundle install - run: | - ruby -v - bundle config path vendor/bundle - bundle install --jobs 4 --retry 3 - - run: bundle exec rubocop - run: bundle exec rspec + - run: bundle exec rubocop + if: matrix.ruby == 3.2 diff --git a/.rubocop.yml b/.rubocop.yml index c3fc127..d805b54 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -1,2 +1,2 @@ inherit_gem: - panolint: panolint-rubocop.yml + panolint-ruby: panolint-ruby-rubocop.yml diff --git a/Gemfile b/Gemfile index 4f3e203..4df0b1c 100644 --- a/Gemfile +++ b/Gemfile @@ -7,5 +7,9 @@ git_source(:github) { |repo| "https://github.com/#{repo}.git" } gemspec group :development do - gem "panolint", github: "panorama-ed/panolint", branch: "main" + gem "codecov" + gem "panolint-ruby", github: "panorama-ed/panolint-ruby", branch: "main" + gem "rspec" + gem "sqlite3" + gem "temping" end diff --git a/README.md b/README.md index 0fa671e..e871e53 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@ [![Code Coverage](https://codecov.io/gh/panorama-ed/attribute_helpers/branch/master/graph/badge.svg)](https://codecov.io/gh/panorama-ed/attribute_helpers) -[![Build Status](https://travis-ci.com/panorama-ed/attribute_helpers.svg)](https://travis-ci.com/panorama-ed/attribute_helpers) +![Test Status](https://github.com/panorama-ed/attribute_helpers/actions/workflows/tests.yml/badge.svg?branch=main) [![Inline docs](http://inch-ci.org/github/panorama-ed/attribute_helpers.png)](http://inch-ci.org/github/panorama-ed/attribute_helpers) [![Gem Version](https://badge.fury.io/rb/attribute_helpers.svg)](http://badge.fury.io/rb/attribute_helpers) diff --git a/attribute_helpers.gemspec b/attribute_helpers.gemspec index 368f016..19fc750 100644 --- a/attribute_helpers.gemspec +++ b/attribute_helpers.gemspec @@ -20,11 +20,5 @@ Gem::Specification.new do |spec| spec.executables = spec.files.grep(%r{^bin/}) { |f| File.basename(f) } spec.require_paths = ["lib"] - spec.add_development_dependency "bundler" - spec.add_development_dependency "codecov" - spec.add_development_dependency "rake" - spec.add_development_dependency "rspec" - spec.add_development_dependency "sqlite3" - spec.add_development_dependency "temping" spec.metadata["rubygems_mfa_required"] = "true" end