Skip to content

Commit

Permalink
Merge pull request zdennis#763 from mishina2228/refactor-ci
Browse files Browse the repository at this point in the history
Refactor CI
  • Loading branch information
jkowens authored Jan 16, 2022
2 parents 38537f1 + ccb9c53 commit f895037
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 9 deletions.
16 changes: 11 additions & 5 deletions .github/workflows/test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -50,9 +50,7 @@ jobs:
- uses: ruby/setup-ruby@v1
with:
ruby-version: ${{ matrix.ruby }}
- name: Setup Bundler 1.x for Ruby 2.3
if: ${{ matrix.ruby == '2.3' }}
run: echo "BUNDLER_VERSION=1.17.3" >> $GITHUB_ENV
bundler-cache: true
- name: Set up databases
run: |
sudo /etc/init.d/mysql start
Expand All @@ -64,8 +62,6 @@ jobs:
cp test/github/database.yml test/database.yml
env:
PGPASSWORD: postgres
- name: Install dependencies
run : AR_VERSION=${{ env.AR_VERSION }} bundle install
- name: Run tests
run: |
bundle exec rake test:mysql2
Expand All @@ -77,5 +73,15 @@ jobs:
bundle exec rake test:seamless_database_pool
bundle exec rake test:spatialite
bundle exec rake test:sqlite3
lint:
runs-on: ubuntu-latest
env:
AR_VERSION: '7.0'
steps:
- uses: actions/checkout@v2
- uses: ruby/setup-ruby@v1
with:
ruby-version: 2.7
bundler-cache: true
- name: Run Rubocop
run: bundle exec rubocop
4 changes: 0 additions & 4 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -44,10 +44,6 @@ platforms :jruby do
gem "ruby-debug", "= 0.10.4"
end

platforms :mri_19 do
gem "debugger"
end

platforms :ruby do
gem "pry-byebug"
gem "pry", "~> 0.12.0"
Expand Down

0 comments on commit f895037

Please sign in to comment.