Skip to content

Commit

Permalink
Merge pull request #68 from panorama-ed/switch-panolint-to-panolint-ruby
Browse files Browse the repository at this point in the history
Switch panolint to panolint-ruby
  • Loading branch information
JacobEvelyn authored Jun 5, 2023
2 parents 3b48063 + 3842fb9 commit abd5781
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 26 deletions.
19 changes: 5 additions & 14 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ jobs:
fail-fast: false
matrix:
os: [ ubuntu-latest ]
ruby: [ 2.6, 2.7 ]
ruby: [ 3.1, 3.2 ]
runs-on: ${{ matrix.os }}
services:
postgres:
Expand Down Expand Up @@ -41,21 +41,12 @@ jobs:
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
2 changes: 1 addition & 1 deletion .rubocop.yml
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
inherit_gem:
panolint: panolint-rubocop.yml
panolint-ruby: panolint-ruby-rubocop.yml
7 changes: 6 additions & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,10 @@ git_source(:github) { |repo| "https://github.com/#{repo}.git" }
gemspec

group :development do
gem "panolint", github: "panorama-ed/panolint", branch: "main"
gem "mysql2"
gem "panolint-ruby", github: "panorama-ed/panolint-ruby", branch: "main"
gem "pg"
gem "rspec"
gem "rspec-rails"
gem "sqlite3"
end
10 changes: 0 additions & 10 deletions order_as_specified.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -21,15 +21,5 @@ Gem::Specification.new do |spec|

spec.add_dependency "activerecord", ">= 5.0.0"

spec.add_development_dependency "bundler"
spec.add_development_dependency "mysql2"
spec.add_development_dependency "pg"
spec.add_development_dependency "rspec"
spec.add_development_dependency "rspec-rails"

# Older versions of Rails locked in the SQLite3 version, so we have to
# explicitly specify the version here
sqlite3 = ENV["ACTIVERECORD_VERSION"] == "~> 5.0.0" ? "~> 1.3.13" : "~> 1.4"
spec.add_development_dependency "sqlite3", sqlite3
spec.metadata["rubygems_mfa_required"] = "true"
end

0 comments on commit abd5781

Please sign in to comment.