Skip to content

Commit b017f49

Browse files
Merge #533
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]>
2 parents 38afa75 + f18a000 commit b017f49

File tree

6 files changed

+15
-11
lines changed

6 files changed

+15
-11
lines changed

.github/workflows/pre-release-tests.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
strategy:
1414
fail-fast: false
1515
matrix:
16-
ruby-version: ['3.0', '3.1', '3.2']
16+
ruby-version: ['3.1', '3.2', '3.3']
1717
name: integration-tests-against-rc (ruby ${{ matrix.ruby-version }})
1818
runs-on: ubuntu-22.04
1919
steps:

.github/workflows/tests.yml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
strategy:
1818
fail-fast: false
1919
matrix:
20-
ruby-version: ['3.0', '3.1', '3.2']
20+
ruby-version: ['3.1', '3.2', '3.3']
2121
name: integration-tests (ruby ${{ matrix.ruby-version }})
2222
runs-on: ubuntu-22.04
2323
steps:
@@ -34,8 +34,9 @@ jobs:
3434
run: bundle exec rspec
3535
- name: Upload coverage reports to Codecov
3636
uses: codecov/codecov-action@v4
37-
env:
38-
CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
37+
if: matrix.ruby-version == '3.3'
38+
with:
39+
token: ${{ secrets.CODECOV_TOKEN }}
3940

4041
linter_check:
4142
name: linter-check

Gemfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@ gemspec
99

1010
group :development, :test do
1111
gem 'byebug'
12-
gem 'codecov'
1312
gem 'rspec', '~> 3.0'
1413
gem 'simplecov'
14+
gem 'simplecov-cobertura'
1515

1616
# Used only for testing, none of the classes are exposed to the public API.
1717
gem 'jwt'

bors.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
status = [
2-
'integration-tests (ruby 3.0)',
32
'integration-tests (ruby 3.1)',
43
'integration-tests (ruby 3.2)',
5-
'linter-check'
4+
'integration-tests (ruby 3.3)',
5+
'linter-check',
66
]
77
# 1 hour timeout
88
timeout-sec = 3600

docker-compose.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
version: "3.8"
2-
31
volumes:
42
bundle:
53

spec/spec_helper.rb

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,16 @@
2222

2323
unless ENV.fetch('DISABLE_COVERAGE', false)
2424
require 'simplecov'
25-
require 'codecov'
2625

2726
SimpleCov.start do
2827
add_filter %r{^/spec/}
29-
formatter SimpleCov::Formatter::Codecov if ENV['CI']
28+
minimum_coverage 99
29+
30+
if ENV['CI']
31+
require 'simplecov-cobertura'
32+
33+
formatter SimpleCov::Formatter::CoberturaFormatter
34+
end
3035
end
3136
end
3237

0 commit comments

Comments
 (0)