Skip to content

Commit 8b6594b

Browse files
pbolingpboling
authored
Merge pull request #152 from omniauth/release/v3.1.3
Release/v3.1.3
2 parents c20d319 + 31538f6 commit 8b6594b

195 files changed

Lines changed: 4075 additions & 1017 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.envrc‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@ export K_SOUP_COV_DO=true # Means you want code coverage
1919
# Available formats are html, xml, rcov, lcov, json, tty
2020
export K_SOUP_COV_COMMAND_NAME="RSpec Coverage"
2121
export K_SOUP_COV_FORMATTERS="html,tty"
22-
export K_SOUP_COV_MIN_BRANCH=80 # Means you want to enforce X% branch coverage
23-
export K_SOUP_COV_MIN_LINE=91 # Means you want to enforce X% line coverage
22+
export K_SOUP_COV_MIN_BRANCH=76 # Means you want to enforce X% branch coverage
23+
export K_SOUP_COV_MIN_LINE=90 # Means you want to enforce X% line coverage
2424
export K_SOUP_COV_MIN_HARD=true # Means you want the build to fail if the coverage thresholds are not met
2525
export K_SOUP_COV_MULTI_FORMATTERS=true
2626
export MAX_ROWS=1 # Setting for simplecov-console gem for tty output, limits to the worst N rows of bad coverage

‎.github/disabled/truffle.yml‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
#
2727
#jobs:
2828
# test:
29-
# name: Specs ${{ matrix.ruby }} ${{ matrix.appraisal }}${{ matrix.name_extra || '' }}
29+
# name: Specs ${{ matrix.ruby }} ${{ matrix.appraisal_name }}${{ matrix.name_extra || '' }}
3030
# if: "!contains(github.event.commits[0].message, '[ci skip]') && !contains(github.event.commits[0].message, '[skip ci]')"
3131
# runs-on: ubuntu-22.04
3232
# continue-on-error: ${{ matrix.experimental || endsWith(matrix.ruby, 'head') }}
@@ -38,23 +38,23 @@
3838
# # NOTE: truffleruby does not support upgrading rubygems.
3939
# # truffleruby-22.3 (targets Ruby 3.0 compatibility)
4040
# - ruby: "truffleruby-22.3"
41-
# appraisal: "couch-1.17"
41+
# appraisal_name: "couch-1.17"
4242
# exec_cmd: "rake spec:orm:couch_potato"
4343
# gemfile: "Appraisal.root"
4444
# rubygems: default
4545
# bundler: default
4646
#
4747
# # truffleruby-23.0 (targets Ruby 3.1 compatibility)
4848
# - ruby: "truffleruby-23.0"
49-
# appraisal: "couch-1.17"
49+
# appraisal_name: "couch-1.17"
5050
# exec_cmd: "rake spec:orm:couch_potato"
5151
# gemfile: "Appraisal.root"
5252
# rubygems: default
5353
# bundler: default
5454
#
5555
# # truffleruby-23.1 (targets Ruby 3.2 compatibility)
5656
# - ruby: "truffleruby-23.1"
57-
# appraisal: "couch-1.17"
57+
# appraisal_name: "couch-1.17"
5858
# exec_cmd: "rake spec:orm:couch_potato"
5959
# gemfile: "Appraisal.root"
6060
# rubygems: default
@@ -91,7 +91,7 @@
9191
# # NOTE: This does not use the main Gemfile at all.
9292
# - name: Install Root Appraisal
9393
# run: bundle
94-
# - name: Appraisal for ${{ matrix.appraisal }}
95-
# run: bundle exec appraisal ${{ matrix.appraisal }} bundle
94+
# - name: Appraisal for ${{ matrix.appraisal_name }}
95+
# run: bundle exec appraisal ${{ matrix.appraisal_name }} bundle
9696
# - name: Tests for ${{ matrix.ruby }} via ${{ matrix.exec_cmd }}
97-
# run: bundle exec appraisal ${{ matrix.appraisal }} bundle exec ${{ matrix.exec_cmd }}
97+
# run: bundle exec appraisal ${{ matrix.appraisal_name }} bundle exec ${{ matrix.exec_cmd }}

‎.github/workflows/ancient-svc-adapters.yml‎

Lines changed: 110 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,110 @@
1+
name: MRI 2.4, 2.5 (Ancient) Svc Adapters
2+
3+
permissions:
4+
contents: read
5+
6+
env:
7+
K_SOUP_COV_DO: false
8+
9+
on:
10+
push:
11+
branches:
12+
- 'main'
13+
tags:
14+
- '!*' # Do not execute on tags
15+
pull_request:
16+
branches:
17+
- '*'
18+
# Allow manually triggering the workflow.
19+
workflow_dispatch:
20+
21+
# Cancels all previous workflow runs for the same branch that have not yet completed.
22+
concurrency:
23+
# The concurrency group contains the workflow name and the branch name.
24+
group: "${{ github.workflow }}-${{ github.ref }}"
25+
cancel-in-progress: true
26+
27+
jobs:
28+
test:
29+
name: Specs ${{ matrix.ruby }} ${{ matrix.appraisal_name }}${{ matrix.name_extra || '' }}
30+
if: "!contains(github.event.commits[0].message, '[ci skip]') && !contains(github.event.commits[0].message, '[skip ci]')"
31+
runs-on: ubuntu-22.04
32+
continue-on-error: ${{ matrix.experimental || endsWith(matrix.ruby, 'head') }}
33+
env: # $BUNDLE_GEMFILE must be set at job level, so it is set for all steps
34+
BUNDLE_GEMFILE: ${{ github.workspace }}/${{ matrix.gemfile }}.gemfile
35+
strategy:
36+
fail-fast: false
37+
matrix:
38+
include:
39+
# Ruby 2.4
40+
- ruby: "2.4"
41+
appraisal_name: "couch-1.17-r2.4"
42+
exec_cmd: "rake spec:orm:couch_potato"
43+
gemfile: "Appraisal.root"
44+
rubygems: "3.3.27"
45+
bundler: "2.3.27"
46+
47+
- ruby: "2.4"
48+
appraisal_name: "mongoid-7.3-b4.12"
49+
exec_cmd: "rake spec:orm:mongoid"
50+
gemfile: "Appraisal.root"
51+
rubygems: "3.3.27"
52+
bundler: "2.3.27"
53+
54+
# Ruby 2.5
55+
- ruby: "2.5"
56+
appraisal_name: "couch-1.17-r2.5"
57+
exec_cmd: "rake spec:orm:couch_potato"
58+
gemfile: "Appraisal.root"
59+
rubygems: "3.3.27"
60+
bundler: "2.3.27"
61+
62+
- ruby: "2.5"
63+
appraisal_name: "mongoid-7.4-b4.15"
64+
exec_cmd: "rake spec:orm:mongoid"
65+
gemfile: "Appraisal.root"
66+
rubygems: "3.3.27"
67+
bundler: "2.3.27"
68+
69+
steps:
70+
### COUCHDB
71+
- name: Start CouchDB
72+
uses: iamssen/couchdb-github-action@master
73+
if: "endsWith(matrix.exec_cmd, 'couch_potato')"
74+
with:
75+
couchdb-version: "3.4.1"
76+
77+
### MONGODB
78+
- name: Start MongoDB
79+
uses: supercharge/mongodb-github-action@1.12.0
80+
if: "endsWith(matrix.exec_cmd, 'mongoid')"
81+
with:
82+
mongodb-version: "8.0"
83+
84+
### SMOKE-TEST
85+
- name: Smoke CouchDB
86+
if: "endsWith(matrix.exec_cmd, 'couch_potato')"
87+
run: |
88+
curl -f http://127.0.0.1:5984/
89+
curl -X POST -H "Content-Type: application/json; charset=utf-8" -d '{"name": "admin", "password": "password"}' http://127.0.0.1:5984/_session
90+
91+
- name: Checkout
92+
uses: actions/checkout@v4
93+
94+
- name: Setup Ruby & RubyGems
95+
uses: ruby/setup-ruby@v1
96+
with:
97+
ruby-version: ${{ matrix.ruby }}
98+
rubygems: ${{ matrix.rubygems }}
99+
bundler: ${{ matrix.bundler }}
100+
bundler-cache: false
101+
102+
# Raw `bundle` will use the BUNDLE_GEMFILE set to matrix.gemfile (i.e. Appraisal.root)
103+
# We need to do this first to get appraisal installed.
104+
# NOTE: This does not use the main Gemfile at all.
105+
- name: Install Root Appraisal
106+
run: bundle
107+
- name: Appraisal for ${{ matrix.ruby }}@${{ matrix.appraisal_name }}
108+
run: bundle exec appraisal ${{ matrix.appraisal_name }} bundle
109+
- name: Run ${{ matrix.exec_cmd }} on ${{ matrix.ruby }}@${{ matrix.appraisal_name }}
110+
run: bundle exec appraisal ${{ matrix.appraisal_name }} bundle exec ${{ matrix.exec_cmd }}

‎.github/workflows/ancient.yml‎

Lines changed: 26 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,10 @@
1-
name: MRI 2.4, 2.5 (EOL)
1+
name: MRI 2.4, 2.5 (Ancient)
2+
3+
permissions:
4+
contents: read
5+
6+
env:
7+
K_SOUP_COV_DO: false
28

39
on:
410
push:
@@ -20,7 +26,7 @@ concurrency:
2026

2127
jobs:
2228
test:
23-
name: Specs ${{ matrix.ruby }} ${{ matrix.appraisal }}${{ matrix.name_extra || '' }}
29+
name: Specs ${{ matrix.ruby }} ${{ matrix.appraisal_name }}${{ matrix.name_extra || '' }}
2430
if: "!contains(github.event.commits[0].message, '[ci skip]') && !contains(github.event.commits[0].message, '[skip ci]')"
2531
runs-on: ubuntu-22.04
2632
continue-on-error: ${{ matrix.experimental || endsWith(matrix.ruby, 'head') }}
@@ -30,65 +36,41 @@ jobs:
3036
fail-fast: false
3137
matrix:
3238
include:
33-
# # Ruby 2.4
34-
# - ruby: "2.4"
35-
# appraisal: "ar-5-2"
36-
# exec_cmd: "rake spec:orm:active_record"
37-
# gemfile: "Appraisal.root"
38-
# rubygems: "3.3.27"
39-
# bundler: "2.3.27"
40-
# - ruby: "2.4"
41-
# appraisal: "couch-1.17"
42-
# exec_cmd: "rake spec:orm:couch_potato"
43-
# gemfile: "Appraisal.root"
44-
# rubygems: "3.3.27"
45-
# bundler: "2.3.27"
46-
# - ruby: "2.4"
47-
# appraisal: "mongoid-7.3"
48-
# exec_cmd: "rake spec:orm:mongoid"
49-
# gemfile: "Appraisal.root"
50-
# rubygems: "3.3.27"
51-
# bundler: "2.3.27"
52-
# - ruby: "2.4"
53-
# appraisal: "sequel-5.86"
54-
# exec_cmd: "rake spec:orm:sequel"
55-
# gemfile: "Appraisal.root"
56-
# rubygems: "3.3.27"
57-
# bundler: "2.3.27"
58-
59-
# Ruby 2.5
60-
- ruby: "2.5"
61-
appraisal: "ar-5-2"
39+
# Ruby 2.4
40+
- ruby: "2.4"
41+
appraisal_name: "ar-5-2-r2.4"
6242
exec_cmd: "rake spec:orm:active_record"
6343
gemfile: "Appraisal.root"
6444
rubygems: "3.3.27"
6545
bundler: "2.3.27"
66-
- ruby: "2.5"
67-
appraisal: "ar-6-0"
68-
exec_cmd: "rake spec:orm:active_record"
46+
- ruby: "2.4"
47+
appraisal_name: "sequel-5.86-r2.4"
48+
exec_cmd: "rake spec:orm:sequel"
6949
gemfile: "Appraisal.root"
7050
rubygems: "3.3.27"
7151
bundler: "2.3.27"
52+
53+
# Ruby 2.5
7254
- ruby: "2.5"
73-
appraisal: "ar-6-1"
55+
appraisal_name: "ar-5-2-r2"
7456
exec_cmd: "rake spec:orm:active_record"
7557
gemfile: "Appraisal.root"
7658
rubygems: "3.3.27"
7759
bundler: "2.3.27"
7860
- ruby: "2.5"
79-
appraisal: "couch-1.17"
80-
exec_cmd: "rake spec:orm:couch_potato"
61+
appraisal_name: "ar-6-0"
62+
exec_cmd: "rake spec:orm:active_record"
8163
gemfile: "Appraisal.root"
8264
rubygems: "3.3.27"
8365
bundler: "2.3.27"
8466
- ruby: "2.5"
85-
appraisal: "mongoid-7.4"
86-
exec_cmd: "rake spec:orm:mongoid"
67+
appraisal_name: "ar-6-1-r2"
68+
exec_cmd: "rake spec:orm:active_record"
8769
gemfile: "Appraisal.root"
8870
rubygems: "3.3.27"
8971
bundler: "2.3.27"
9072
- ruby: "2.5"
91-
appraisal: "sequel-5.86"
73+
appraisal_name: "sequel-5.86-r2.5"
9274
exec_cmd: "rake spec:orm:sequel"
9375
gemfile: "Appraisal.root"
9476
rubygems: "3.3.27"
@@ -132,7 +114,7 @@ jobs:
132114
# NOTE: This does not use the main Gemfile at all.
133115
- name: Install Root Appraisal
134116
run: bundle
135-
- name: Appraisal for ${{ matrix.appraisal }}
136-
run: bundle exec appraisal ${{ matrix.appraisal }} bundle
137-
- name: Tests for ${{ matrix.ruby }} via ${{ matrix.exec_cmd }}
138-
run: bundle exec appraisal ${{ matrix.appraisal }} bundle exec ${{ matrix.exec_cmd }}
117+
- name: Appraisal for ${{ matrix.ruby }}@${{ matrix.appraisal_name }}
118+
run: bundle exec appraisal ${{ matrix.appraisal_name }} bundle
119+
- name: Run ${{ matrix.exec_cmd }} on ${{ matrix.ruby }}@${{ matrix.appraisal_name }}
120+
run: bundle exec appraisal ${{ matrix.appraisal_name }} bundle exec ${{ matrix.exec_cmd }}

‎.github/workflows/coverage.yml‎

Lines changed: 39 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,15 @@
11
name: Test Coverage
22

3+
permissions:
4+
contents: read
5+
pull-requests: write
6+
id-token: write
7+
38
env:
4-
K_SOUP_COV_MIN_BRANCH: 79
5-
K_SOUP_COV_MIN_LINE: 92
9+
K_SOUP_COV_MIN_BRANCH: 76
10+
K_SOUP_COV_MIN_LINE: 90
611
K_SOUP_COV_MIN_HARD: true
7-
K_SOUP_COV_FORMATTERS: "html,rcov,lcov,json,tty"
12+
K_SOUP_COV_FORMATTERS: "html,xml,rcov,lcov,json,tty"
813
K_SOUP_COV_DO: true
914
K_SOUP_COV_MULTI_FORMATTERS: true
1015
K_SOUP_COV_COMMAND_NAME: "RSpec Coverage"
@@ -21,9 +26,6 @@ on:
2126
# Allow manually triggering the workflow.
2227
workflow_dispatch:
2328

24-
permissions:
25-
contents: read
26-
2729
# Cancels all previous workflow runs for the same branch that have not yet completed.
2830
concurrency:
2931
# The concurrency group contains the workflow name and the branch name.
@@ -44,7 +46,7 @@ jobs:
4446
include:
4547
# Coverage
4648
- ruby: "ruby"
47-
appraisal: "coverage"
49+
appraisal_name: "coverage"
4850
exec_cmd: "rake spec:orm:all"
4951
gemfile: "Appraisal.root"
5052
rubygems: latest
@@ -82,14 +84,38 @@ jobs:
8284

8385
# Raw `bundle` will use the BUNDLE_GEMFILE set to matrix.gemfile (i.e. Appraisal.root)
8486
# We need to do this first to get appraisal installed.
85-
# NOTE: This does not use the main Gemfile at all.
87+
# NOTE: This does not use the primary Gemfile at all.
8688
- name: Install Root Appraisal
8789
run: bundle
88-
- name: Appraisal for ${{ matrix.appraisal }}
89-
run: bundle exec appraisal ${{ matrix.appraisal }} bundle
90-
- name: Tests for ${{ matrix.ruby }}@current via ${{ matrix.exec_cmd }}
91-
run: bundle exec appraisal ${{ matrix.appraisal }} bundle exec ${{ matrix.exec_cmd }}
90+
- name: Appraisal for ${{ matrix.ruby }}@${{ matrix.appraisal_name }}
91+
run: bundle exec appraisal ${{ matrix.appraisal_name }} bundle
92+
- name: Run ${{ matrix.exec_cmd }} on ${{ matrix.ruby }}@${{ matrix.appraisal_name }}
93+
run: bundle exec appraisal ${{ matrix.appraisal_name }} bundle exec ${{ matrix.exec_cmd }}
9294

95+
# Do SaaS coverage uploads first
96+
- name: Upload coverage to Coveralls
97+
uses: coverallsapp/github-action@master
98+
with:
99+
github-token: ${{ secrets.GITHUB_TOKEN }}
100+
continue-on-error: ${{ matrix.experimental != 'false' }}
101+
102+
- name: Upload coverage to QLTY
103+
uses: qltysh/qlty-action/coverage@main
104+
with:
105+
token: ${{secrets.QLTY_COVERAGE_TOKEN}}
106+
files: coverage/.resultset.json
107+
continue-on-error: ${{ matrix.experimental != 'false' }}
108+
109+
# Build will fail here if coverage upload fails
110+
# which will hopefully be noticed for the lack of code coverage comments
111+
- name: Upload coverage to CodeCov
112+
uses: codecov/codecov-action@v5
113+
with:
114+
use_oidc: true
115+
fail_ci_if_error: true # optional (default = false)
116+
verbose: true # optional (default = false)
117+
118+
# Then PR comments
93119
- name: Code Coverage Summary Report
94120
uses: irongut/CodeCoverageSummary@v1.3.0
95121
if: ${{ github.event_name == 'pull_request' }}
@@ -102,7 +128,7 @@ jobs:
102128
hide_complexity: true
103129
indicators: true
104130
output: both
105-
thresholds: '100 100'
131+
thresholds: '90 76'
106132
continue-on-error: ${{ matrix.experimental != 'false' }}
107133

108134
- name: Add Coverage PR Comment
@@ -112,16 +138,3 @@ jobs:
112138
recreate: true
113139
path: code-coverage-results.md
114140
continue-on-error: ${{ matrix.experimental != 'false' }}
115-
116-
- name: Upload coverage to Coveralls
117-
uses: coverallsapp/github-action@master
118-
with:
119-
github-token: ${{ secrets.GITHUB_TOKEN }}
120-
continue-on-error: ${{ matrix.experimental != 'false' }}
121-
122-
- name: Upload coverage to CodeCov
123-
uses: codecov/codecov-action@v5
124-
with:
125-
fail_ci_if_error: true # optional (default = false)
126-
token: ${{ secrets.CODECOV_TOKEN }}
127-
verbose: true # optional (default = false)

0 commit comments

Comments
 (0)