Skip to content

Commit

Permalink
Merge #533
Browse files Browse the repository at this point in the history
533: Remove ruby 3.0 & Upgrade codecov setup r=curquiza a=brunoocasali

Just a couple of maintenance stuff: 

- remove ruby 3.0 from the CI runs.
- Upload codecov only from the ruby 3.3 execution
- Remove `codecov` gem
- Add `simplecov-cobertura` gem


Co-authored-by: Bruno Casali <[email protected]>
  • Loading branch information
meili-bors[bot] and brunoocasali authored May 7, 2024
2 parents 38afa75 + f18a000 commit b017f49
Show file tree
Hide file tree
Showing 6 changed files with 15 additions and 11 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/pre-release-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
strategy:
fail-fast: false
matrix:
ruby-version: ['3.0', '3.1', '3.2']
ruby-version: ['3.1', '3.2', '3.3']
name: integration-tests-against-rc (ruby ${{ matrix.ruby-version }})
runs-on: ubuntu-22.04
steps:
Expand Down
7 changes: 4 additions & 3 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
strategy:
fail-fast: false
matrix:
ruby-version: ['3.0', '3.1', '3.2']
ruby-version: ['3.1', '3.2', '3.3']
name: integration-tests (ruby ${{ matrix.ruby-version }})
runs-on: ubuntu-22.04
steps:
Expand All @@ -34,8 +34,9 @@ jobs:
run: bundle exec rspec
- name: Upload coverage reports to Codecov
uses: codecov/codecov-action@v4
env:
CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
if: matrix.ruby-version == '3.3'
with:
token: ${{ secrets.CODECOV_TOKEN }}

linter_check:
name: linter-check
Expand Down
2 changes: 1 addition & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@ gemspec

group :development, :test do
gem 'byebug'
gem 'codecov'
gem 'rspec', '~> 3.0'
gem 'simplecov'
gem 'simplecov-cobertura'

# Used only for testing, none of the classes are exposed to the public API.
gem 'jwt'
Expand Down
4 changes: 2 additions & 2 deletions bors.toml
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
status = [
'integration-tests (ruby 3.0)',
'integration-tests (ruby 3.1)',
'integration-tests (ruby 3.2)',
'linter-check'
'integration-tests (ruby 3.3)',
'linter-check',
]
# 1 hour timeout
timeout-sec = 3600
2 changes: 0 additions & 2 deletions docker-compose.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
version: "3.8"

volumes:
bundle:

Expand Down
9 changes: 7 additions & 2 deletions spec/spec_helper.rb
Original file line number Diff line number Diff line change
Expand Up @@ -22,11 +22,16 @@

unless ENV.fetch('DISABLE_COVERAGE', false)
require 'simplecov'
require 'codecov'

SimpleCov.start do
add_filter %r{^/spec/}
formatter SimpleCov::Formatter::Codecov if ENV['CI']
minimum_coverage 99

if ENV['CI']
require 'simplecov-cobertura'

formatter SimpleCov::Formatter::CoberturaFormatter
end
end
end

Expand Down

0 comments on commit b017f49

Please sign in to comment.