Skip to content

Commit 2fd82a1

Browse files
authored
Merge pull request #60 from ruby-openid/next
Remove HTML Coverage export
2 parents 96c2abc + 33796b3 commit 2fd82a1

File tree

7 files changed

+25
-32
lines changed

7 files changed

+25
-32
lines changed

.github/workflows/coverage.yml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,12 @@ permissions:
66
id-token: write
77

88
env:
9+
COVERAGE: true
910
K_SOUP_COV_MIN_BRANCH: 85
1011
K_SOUP_COV_MIN_LINE: 91
1112
K_SOUP_COV_MIN_HARD: true
12-
K_SOUP_COV_FORMATTERS: "html,xml,rcov,lcov,json,tty"
13+
# Removed HTML output, see: https://github.com/codecov/feedback/discussions/726#discussioncomment-13756707
14+
K_SOUP_COV_FORMATTERS: "xml,rcov,lcov,json,tty"
1315
K_SOUP_COV_DO: true
1416
K_SOUP_COV_MULTI_FORMATTERS: true
1517
K_SOUP_COV_COMMAND_NAME: "Test Coverage"
@@ -94,6 +96,7 @@ jobs:
9496
# Build will fail here if coverage upload fails
9597
# which will hopefully be noticed for the lack of code coverage comments
9698
- name: Upload coverage to CodeCov
99+
if: ${{ !env.ACT }}
97100
uses: codecov/codecov-action@v5
98101
with:
99102
use_oidc: true

.github/workflows/current.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -37,23 +37,23 @@ jobs:
3737
strategy:
3838
matrix:
3939
include:
40-
# Ruby 3.4
41-
- ruby: "3.4"
40+
# Ruby <whichever version is current, e.g., 3.4 as of 2025-07-12>
41+
- ruby: "ruby"
4242
appraisal_name: "r3"
4343
exec_cmd: "rake test"
4444
gemfile: "Appraisal.root"
4545
rubygems: latest
4646
bundler: latest
4747

48-
# truffleruby-24.1
48+
# truffleruby <whichever version is current, e.g., 24.1 as of 2025-07-12>
4949
- ruby: "truffleruby"
5050
appraisal_name: "r3"
5151
exec_cmd: "rake test"
5252
gemfile: "Appraisal.root"
5353
rubygems: default
5454
bundler: default
5555

56-
# jruby-10.0 (targets Ruby 3.4 compatibility)
56+
# jruby <whichever version is current, e.g., 10.0 (targets Ruby 3.4 compatibility) as of 2025-07-12>
5757
- ruby: "jruby"
5858
appraisal_name: "r3"
5959
exec_cmd: "rake test"
@@ -75,7 +75,7 @@ jobs:
7575
bundler: ${{ matrix.bundler }}
7676
bundler-cache: false
7777

78-
# Raw `bundle` will use the BUNDLE_GEMFILE set to matrix.gemfile (i.e. Appraisal.root)
78+
# Raw `bundle` will use the BUNDLE_GEMFILE set to matrix.gemfile (i.e., Appraisal.root)
7979
# We need to do this first to get appraisal installed.
8080
# NOTE: This does not use the main Gemfile at all.
8181
- name: Install Root Appraisal

.idea/workspace.xml

Lines changed: 6 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Appraisal.root.gemfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,4 +14,4 @@ source "https://rubygems.org"
1414

1515
gemspec
1616

17-
gem "appraisal", github: "pboling/appraisal", branch: "galtzo"
17+
gem "appraisal2", github: "appraisal-rb/appraisal2", branch: "main"

Gemfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ gemspec
2626
eval_gemfile "gemfiles/modular/debug.gemfile"
2727

2828
### Testing
29-
gem "appraisal", github: "pboling/appraisal", branch: "galtzo"
29+
gem "appraisal2", github: "appraisal-rb/appraisal2", branch: "main"
3030

3131
# Only runs on the latest Ruby
3232
if current_ruby_version >= latest_ruby_version

Gemfile.lock

Lines changed: 8 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,9 @@
11
GIT
2-
remote: https://github.com/dashingrocket/simplecov-cobertura
3-
revision: b72eacdeab8b055533debc6fd150cb977db0ca3e
2+
remote: https://github.com/appraisal-rb/appraisal2
3+
revision: 499a56ddcd75b413ed4b536ab8c0b6db47afa907
44
branch: main
55
specs:
6-
simplecov-cobertura (2.1.1.pre.dev)
7-
rexml
8-
simplecov (~> 0.19)
9-
10-
GIT
11-
remote: https://github.com/pboling/appraisal
12-
revision: a3a3e4b7db67d9b085f96b2ffddd2b51bd8a1196
13-
branch: galtzo
14-
specs:
15-
appraisal (3.0.0.rc1)
6+
appraisal2 (3.0.0)
167
bundler (>= 1.17.3)
178
rake (>= 10)
189
thor (>= 0.14)
@@ -127,7 +118,7 @@ GEM
127118
racc (1.8.1)
128119
rainbow (3.1.1)
129120
rake (13.3.0)
130-
rdoc (6.14.1)
121+
rdoc (6.14.2)
131122
erb
132123
psych (>= 4.0.0)
133124
reek (6.5.0)
@@ -202,6 +193,9 @@ GEM
202193
docile (~> 1.1)
203194
simplecov-html (~> 0.11)
204195
simplecov_json_formatter (~> 0.1)
196+
simplecov-cobertura (2.1.0)
197+
rexml
198+
simplecov (~> 0.19)
205199
simplecov-console (0.9.3)
206200
ansi
207201
simplecov
@@ -250,7 +244,7 @@ PLATFORMS
250244
x86_64-linux
251245

252246
DEPENDENCIES
253-
appraisal!
247+
appraisal2!
254248
benchmark (~> 0.4)
255249
bundler-audit (~> 0.9.2)
256250
cgi (~> 0.5.0)
@@ -272,7 +266,6 @@ DEPENDENCIES
272266
rubocop-minitest (~> 0.36)
273267
rubocop-packaging (~> 0.6, >= 0.6.0)
274268
ruby-openid2!
275-
simplecov-cobertura!
276269
standard (~> 1.47)
277270
stone_checksums (~> 1.0)
278271
uri (~> 1.0, >= 1.0.3)

gemfiles/modular/coverage.gemfile

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,3 @@
44

55
# Coverage
66
# All coverage gems are listed in gemspec dependencies.
7-
# But fix in the main branch (https://github.com/dashingrocket/simplecov-cobertura/pull/32)
8-
# needed to prevent the circular require warning and stacktrace.
9-
gem "simplecov-cobertura", github: "dashingrocket/simplecov-cobertura", branch: "main"

0 commit comments

Comments
 (0)