Skip to content

Commit 045ae47

Browse files
pbolingpboling
authored
Merge pull request #4 from ruby-oauth/kettle-dev
2 parents 4b3e409 + 257f03e commit 045ae47

27 files changed

+587
-218
lines changed

‎.envrc‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@ export K_SOUP_COV_DO=true # Means you want code coverage
2121
export K_SOUP_COV_COMMAND_NAME="Test Coverage"
2222
# Available formats are html, xml, rcov, lcov, json, tty
2323
export K_SOUP_COV_FORMATTERS="html,xml,rcov,lcov,json,tty"
24-
export K_SOUP_COV_MIN_BRANCH=80 # Means you want to enforce X% branch coverage
25-
export K_SOUP_COV_MIN_LINE=96 # Means you want to enforce X% line coverage
24+
export K_SOUP_COV_MIN_BRANCH=96 # Means you want to enforce X% branch coverage
25+
export K_SOUP_COV_MIN_LINE=100 # Means you want to enforce X% line coverage
2626
export K_SOUP_COV_MIN_HARD=true # Means you want the build to fail if the coverage thresholds are not met
2727
export K_SOUP_COV_MULTI_FORMATTERS=true
2828
export K_SOUP_COV_OPEN_BIN= # Means don't try to open coverage results in browser

‎.github/workflows/coverage.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ permissions:
66
id-token: write
77

88
env:
9-
K_SOUP_COV_MIN_BRANCH: 100
9+
K_SOUP_COV_MIN_BRANCH: 96
1010
K_SOUP_COV_MIN_LINE: 100
1111
K_SOUP_COV_MIN_HARD: true
1212
K_SOUP_COV_FORMATTERS: "xml,rcov,lcov,tty"
@@ -115,7 +115,7 @@ jobs:
115115
hide_complexity: true
116116
indicators: true
117117
output: both
118-
thresholds: '100 100'
118+
thresholds: '100 96'
119119
continue-on-error: ${{ matrix.experimental != 'false' }}
120120

121121
- name: Add Coverage PR Comment

‎.github/workflows/current.yml‎

Lines changed: 33 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -63,11 +63,11 @@ jobs:
6363

6464
steps:
6565
- name: Checkout
66-
if: ${{ !(env.ACT && startsWith(matrix.ruby, 'jruby')) }}
66+
if: ${{ !(env.ACT && (startsWith(matrix.ruby, 'jruby')) || startsWith(matrix.ruby, 'truffleruby')) }}
6767
uses: actions/checkout@v5
6868

6969
- name: Setup Ruby & RubyGems
70-
if: ${{ !(env.ACT && startsWith(matrix.ruby, 'jruby')) }}
70+
if: ${{ !(env.ACT && (startsWith(matrix.ruby, 'jruby')) || startsWith(matrix.ruby, 'truffleruby')) }}
7171
uses: ruby/setup-ruby@v1
7272
with:
7373
ruby-version: ${{ matrix.ruby }}
@@ -79,11 +79,37 @@ jobs:
7979
# We need to do this first to get appraisal installed.
8080
# NOTE: This does not use the primary Gemfile at all.
8181
- name: Install Root Appraisal
82-
if: ${{ !(env.ACT && startsWith(matrix.ruby, 'jruby')) }}
82+
if: ${{ !(env.ACT && (startsWith(matrix.ruby, 'jruby')) || startsWith(matrix.ruby, 'truffleruby')) }}
8383
run: bundle
84-
- name: Appraisal for ${{ matrix.ruby }}@${{ matrix.appraisal }}
85-
if: ${{ !(env.ACT && startsWith(matrix.ruby, 'jruby')) }}
84+
85+
- name: "[Attempt 1] Install Root Appraisal"
86+
id: bundleAttempt1
87+
if: ${{ !(env.ACT && (startsWith(matrix.ruby, 'jruby')) || startsWith(matrix.ruby, 'truffleruby')) }}
88+
run: bundle
89+
# Continue to the next step on failure
90+
continue-on-error: true
91+
92+
# Effectively an automatic retry of the previous step.
93+
- name: "[Attempt 2] Install Root Appraisal"
94+
id: bundleAttempt2
95+
# If bundleAttempt1 failed, try again here; Otherwise skip.
96+
if: ${{ steps.bundleAttempt1.outcome == 'failure' && !(env.ACT && (startsWith(matrix.ruby, 'jruby')) || startsWith(matrix.ruby, 'truffleruby')) }}
97+
run: bundle
98+
99+
- name: "[Attempt 1] Appraisal for ${{ matrix.ruby }}@${{ matrix.appraisal }}"
100+
id: bundleAppraisalAttempt1
101+
if: ${{ !(env.ACT && (startsWith(matrix.ruby, 'jruby')) || startsWith(matrix.ruby, 'truffleruby')) }}
102+
run: bundle exec appraisal ${{ matrix.appraisal }} bundle
103+
# Continue to the next step on failure
104+
continue-on-error: true
105+
106+
# Effectively an automatic retry of the previous step.
107+
- name: "[Attempt 2] Appraisal for ${{ matrix.ruby }}@${{ matrix.appraisal }}"
108+
id: bundleAppraisalAttempt2
109+
# If bundleAppraisalAttempt1 failed, try again here; Otherwise skip.
110+
if: ${{ steps.bundleAppraisalAttempt1.outcome == 'failure' && !(env.ACT && (startsWith(matrix.ruby, 'jruby')) || startsWith(matrix.ruby, 'truffleruby')) }}
86111
run: bundle exec appraisal ${{ matrix.appraisal }} bundle
87-
- name: Tests for ${{ matrix.ruby }}@${{ matrix.appraisal }} via ${{ matrix.exec_cmd }}
88-
if: ${{ !(env.ACT && startsWith(matrix.ruby, 'jruby')) }}
112+
113+
- name: Tests for ${{ matrix.ruby }} via ${{ matrix.exec_cmd }}
114+
if: ${{ !(env.ACT && (startsWith(matrix.ruby, 'jruby')) || startsWith(matrix.ruby, 'truffleruby')) }}
89115
run: bundle exec appraisal ${{ matrix.appraisal }} bundle exec ${{ matrix.exec_cmd }}

‎.github/workflows/dep-heads.yml‎

Lines changed: 25 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -67,11 +67,11 @@ jobs:
6767

6868
steps:
6969
- name: Checkout
70-
if: ${{ !(env.ACT && startsWith(matrix.ruby, 'jruby')) }}
70+
if: ${{ !(env.ACT && (startsWith(matrix.ruby, 'jruby')) || startsWith(matrix.ruby, 'truffleruby')) }}
7171
uses: actions/checkout@v5
7272

7373
- name: Setup Ruby & RubyGems
74-
if: ${{ !(env.ACT && startsWith(matrix.ruby, 'jruby')) }}
74+
if: ${{ !(env.ACT && (startsWith(matrix.ruby, 'jruby')) || startsWith(matrix.ruby, 'truffleruby')) }}
7575
uses: ruby/setup-ruby@v1
7676
with:
7777
ruby-version: ${{ matrix.ruby }}
@@ -82,24 +82,38 @@ jobs:
8282
# Raw `bundle` will use the BUNDLE_GEMFILE set to matrix.gemfile (i.e. Appraisal.root)
8383
# We need to do this first to get appraisal installed.
8484
# NOTE: This does not use the primary Gemfile at all.
85-
- name: "Install Root Appraisal"
86-
if: ${{ !(env.ACT && startsWith(matrix.ruby, 'jruby')) }}
85+
- name: Install Root Appraisal
86+
if: ${{ !(env.ACT && (startsWith(matrix.ruby, 'jruby')) || startsWith(matrix.ruby, 'truffleruby')) }}
8787
run: bundle
8888

89-
- name: "[Attempt 1] Appraisal for ${{ matrix.ruby }}@${{ matrix.appraisal }}"
90-
if: ${{ !(env.ACT && startsWith(matrix.ruby, 'jruby')) }}
89+
- name: "[Attempt 1] Install Root Appraisal"
9190
id: bundleAttempt1
91+
if: ${{ !(env.ACT && (startsWith(matrix.ruby, 'jruby')) || startsWith(matrix.ruby, 'truffleruby')) }}
92+
run: bundle
93+
# Continue to the next step on failure
94+
continue-on-error: true
95+
96+
# Effectively an automatic retry of the previous step.
97+
- name: "[Attempt 2] Install Root Appraisal"
98+
id: bundleAttempt2
99+
# If bundleAttempt1 failed, try again here; Otherwise skip.
100+
if: ${{ steps.bundleAttempt1.outcome == 'failure' && !(env.ACT && (startsWith(matrix.ruby, 'jruby')) || startsWith(matrix.ruby, 'truffleruby')) }}
101+
run: bundle
102+
103+
- name: "[Attempt 1] Appraisal for ${{ matrix.ruby }}@${{ matrix.appraisal }}"
104+
id: bundleAppraisalAttempt1
105+
if: ${{ !(env.ACT && (startsWith(matrix.ruby, 'jruby')) || startsWith(matrix.ruby, 'truffleruby')) }}
92106
run: bundle exec appraisal ${{ matrix.appraisal }} bundle
93107
# Continue to the next step on failure
94108
continue-on-error: true
95109

96110
# Effectively an automatic retry of the previous step.
97111
- name: "[Attempt 2] Appraisal for ${{ matrix.ruby }}@${{ matrix.appraisal }}"
98-
# If bundleAttempt1 failed, try again here; Otherwise skip.
99-
if: ${{ steps.bundleAttempt1.outcome == 'failure' && !(env.ACT && startsWith(matrix.ruby, 'jruby')) }}
100-
id: bundleAttempt2
112+
id: bundleAppraisalAttempt2
113+
# If bundleAppraisalAttempt1 failed, try again here; Otherwise skip.
114+
if: ${{ steps.bundleAppraisalAttempt1.outcome == 'failure' && !(env.ACT && (startsWith(matrix.ruby, 'jruby')) || startsWith(matrix.ruby, 'truffleruby')) }}
101115
run: bundle exec appraisal ${{ matrix.appraisal }} bundle
102116

103-
- name: Tests for ${{ matrix.ruby }}@${{ matrix.appraisal }} via ${{ matrix.exec_cmd }}
104-
if: ${{ !(env.ACT && startsWith(matrix.ruby, 'jruby')) }}
117+
- name: Tests for ${{ matrix.ruby }} via ${{ matrix.exec_cmd }}
118+
if: ${{ !(env.ACT && (startsWith(matrix.ruby, 'jruby')) || startsWith(matrix.ruby, 'truffleruby')) }}
105119
run: bundle exec appraisal ${{ matrix.appraisal }} bundle exec ${{ matrix.exec_cmd }}

‎.github/workflows/heads.yml‎

Lines changed: 25 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -64,11 +64,11 @@ jobs:
6464

6565
steps:
6666
- name: Checkout
67-
if: ${{ !(env.ACT && startsWith(matrix.ruby, 'jruby')) }}
67+
if: ${{ !(env.ACT && (startsWith(matrix.ruby, 'jruby')) || startsWith(matrix.ruby, 'truffleruby')) }}
6868
uses: actions/checkout@v5
6969

7070
- name: Setup Ruby & RubyGems
71-
if: ${{ !(env.ACT && startsWith(matrix.ruby, 'jruby')) }}
71+
if: ${{ !(env.ACT && (startsWith(matrix.ruby, 'jruby')) || startsWith(matrix.ruby, 'truffleruby')) }}
7272
uses: ruby/setup-ruby@v1
7373
with:
7474
ruby-version: ${{ matrix.ruby }}
@@ -79,24 +79,38 @@ jobs:
7979
# Raw `bundle` will use the BUNDLE_GEMFILE set to matrix.gemfile (i.e. Appraisal.root)
8080
# We need to do this first to get appraisal installed.
8181
# NOTE: This does not use the primary Gemfile at all.
82-
- name: "Install Root Appraisal"
83-
if: ${{ !(env.ACT && startsWith(matrix.ruby, 'jruby')) }}
82+
- name: Install Root Appraisal
83+
if: ${{ !(env.ACT && (startsWith(matrix.ruby, 'jruby')) || startsWith(matrix.ruby, 'truffleruby')) }}
8484
run: bundle
8585

86-
- name: "[Attempt 1] Appraisal for ${{ matrix.ruby }}@${{ matrix.appraisal }}"
87-
if: ${{ !(env.ACT && startsWith(matrix.ruby, 'jruby')) }}
86+
- name: "[Attempt 1] Install Root Appraisal"
8887
id: bundleAttempt1
88+
if: ${{ !(env.ACT && (startsWith(matrix.ruby, 'jruby')) || startsWith(matrix.ruby, 'truffleruby')) }}
89+
run: bundle
90+
# Continue to the next step on failure
91+
continue-on-error: true
92+
93+
# Effectively an automatic retry of the previous step.
94+
- name: "[Attempt 2] Install Root Appraisal"
95+
id: bundleAttempt2
96+
# If bundleAttempt1 failed, try again here; Otherwise skip.
97+
if: ${{ steps.bundleAttempt1.outcome == 'failure' && !(env.ACT && (startsWith(matrix.ruby, 'jruby')) || startsWith(matrix.ruby, 'truffleruby')) }}
98+
run: bundle
99+
100+
- name: "[Attempt 1] Appraisal for ${{ matrix.ruby }}@${{ matrix.appraisal }}"
101+
id: bundleAppraisalAttempt1
102+
if: ${{ !(env.ACT && (startsWith(matrix.ruby, 'jruby')) || startsWith(matrix.ruby, 'truffleruby')) }}
89103
run: bundle exec appraisal ${{ matrix.appraisal }} bundle
90104
# Continue to the next step on failure
91105
continue-on-error: true
92106

93107
# Effectively an automatic retry of the previous step.
94108
- name: "[Attempt 2] Appraisal for ${{ matrix.ruby }}@${{ matrix.appraisal }}"
95-
# If bundleAttempt1 failed, try again here; Otherwise skip.
96-
if: ${{ steps.bundleAttempt1.outcome == 'failure' && !(env.ACT && startsWith(matrix.ruby, 'jruby')) }}
97-
id: bundleAttempt2
109+
id: bundleAppraisalAttempt2
110+
# If bundleAppraisalAttempt1 failed, try again here; Otherwise skip.
111+
if: ${{ steps.bundleAppraisalAttempt1.outcome == 'failure' && !(env.ACT && (startsWith(matrix.ruby, 'jruby')) || startsWith(matrix.ruby, 'truffleruby')) }}
98112
run: bundle exec appraisal ${{ matrix.appraisal }} bundle
99113

100-
- name: Tests for ${{ matrix.ruby }}@${{ matrix.appraisal }} via ${{ matrix.exec_cmd }}
101-
if: ${{ !(env.ACT && startsWith(matrix.ruby, 'jruby')) }}
114+
- name: Tests for ${{ matrix.ruby }} via ${{ matrix.exec_cmd }}
115+
if: ${{ !(env.ACT && (startsWith(matrix.ruby, 'jruby')) || startsWith(matrix.ruby, 'truffleruby')) }}
102116
run: bundle exec appraisal ${{ matrix.appraisal }} bundle exec ${{ matrix.exec_cmd }}

‎.github/workflows/truffle.yml‎

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -47,9 +47,11 @@ jobs:
4747

4848
steps:
4949
- name: Checkout
50+
if: ${{ !(env.ACT && (startsWith(matrix.ruby, 'jruby')) || startsWith(matrix.ruby, 'truffleruby')) }}
5051
uses: actions/checkout@v5
5152

5253
- name: Setup Ruby & RubyGems
54+
if: ${{ !(env.ACT && (startsWith(matrix.ruby, 'jruby')) || startsWith(matrix.ruby, 'truffleruby')) }}
5355
uses: ruby/setup-ruby@v1
5456
with:
5557
ruby-version: ${{ matrix.ruby }}
@@ -61,10 +63,12 @@ jobs:
6163
# We need to do this first to get appraisal installed.
6264
# NOTE: This does not use the primary Gemfile at all.
6365
- name: Install Root Appraisal
66+
if: ${{ !(env.ACT && (startsWith(matrix.ruby, 'jruby')) || startsWith(matrix.ruby, 'truffleruby')) }}
6467
run: bundle
6568

6669
- name: "[Attempt 1] Install Root Appraisal"
6770
id: bundleAttempt1
71+
if: ${{ !(env.ACT && (startsWith(matrix.ruby, 'jruby')) || startsWith(matrix.ruby, 'truffleruby')) }}
6872
run: bundle
6973
# Continue to the next step on failure
7074
continue-on-error: true
@@ -73,21 +77,23 @@ jobs:
7377
- name: "[Attempt 2] Install Root Appraisal"
7478
id: bundleAttempt2
7579
# If bundleAttempt1 failed, try again here; Otherwise skip.
76-
if: steps.bundleAttempt1.outcome == 'failure'
80+
if: ${{ steps.bundleAttempt1.outcome == 'failure' && !(env.ACT && (startsWith(matrix.ruby, 'jruby')) || startsWith(matrix.ruby, 'truffleruby')) }}
7781
run: bundle
7882

7983
- name: "[Attempt 1] Appraisal for ${{ matrix.ruby }}@${{ matrix.appraisal }}"
8084
id: bundleAppraisalAttempt1
85+
if: ${{ !(env.ACT && (startsWith(matrix.ruby, 'jruby')) || startsWith(matrix.ruby, 'truffleruby')) }}
8186
run: bundle exec appraisal ${{ matrix.appraisal }} bundle
8287
# Continue to the next step on failure
8388
continue-on-error: true
8489

8590
# Effectively an automatic retry of the previous step.
8691
- name: "[Attempt 2] Appraisal for ${{ matrix.ruby }}@${{ matrix.appraisal }}"
8792
id: bundleAppraisalAttempt2
88-
# If bundleAttempt1 failed, try again here; Otherwise skip.
89-
if: steps.bundleAppraisalAttempt1.outcome == 'failure'
93+
# If bundleAppraisalAttempt1 failed, try again here; Otherwise skip.
94+
if: ${{ steps.bundleAppraisalAttempt1.outcome == 'failure' && !(env.ACT && (startsWith(matrix.ruby, 'jruby')) || startsWith(matrix.ruby, 'truffleruby')) }}
9095
run: bundle exec appraisal ${{ matrix.appraisal }} bundle
9196

9297
- name: Tests for ${{ matrix.ruby }} via ${{ matrix.exec_cmd }}
98+
if: ${{ !(env.ACT && (startsWith(matrix.ruby, 'jruby')) || startsWith(matrix.ruby, 'truffleruby')) }}
9399
run: bundle exec appraisal ${{ matrix.appraisal }} bundle exec ${{ matrix.exec_cmd }}

‎.gitlab-ci.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ variables:
2222
K_SOUP_COV_DEBUG: true
2323
K_SOUP_COV_DO: true
2424
K_SOUP_COV_HARD: true
25-
K_SOUP_COV_MIN_BRANCH: 100
25+
K_SOUP_COV_MIN_BRANCH: 96
2626
K_SOUP_COV_MIN_LINE: 100
2727
K_SOUP_COV_VERBOSE: true
2828
K_SOUP_COV_FORMATTERS: "tty"

‎.idea/misc.xml‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎.idea/vcs.xml‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)