Skip to content

Commit a4e7808

Browse files
authored
Merge pull request #684 from johnnyshields/update-v2.x-20240708
v2.0: Merge latest master into v2.0
2 parents d159c46 + a7129b4 commit a4e7808

30 files changed

+1342
-221
lines changed

.github/FUNDING.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
# These are supported funding model platforms
2+
3+
github: [SAML-Toolkits]

.github/workflows/test.yml

Lines changed: 9 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -8,27 +8,15 @@ jobs:
88
strategy:
99
fail-fast: false
1010
matrix:
11-
os: [ubuntu-20.04] # macos-latest
12-
ruby-version: [2.6, 2.7, 3.0, 3.1, 3.2, jruby-9.3, jruby-9.4, truffleruby]
13-
include:
14-
- os: macos-latest
15-
ruby-version: 2.6
16-
- os: macos-latest
17-
ruby-version: 2.7
18-
- os: macos-latest
19-
ruby-version: 3.0
20-
- os: macos-latest
21-
ruby-version: 3.1
22-
- os: macos-latest
23-
ruby-version: 3.2
24-
- os: macos-latest
25-
ruby-version: jruby-9.3
26-
# 2023/03/07 - JRuby 9.4 on MacOS is skipped for now.
27-
# Seems to be a JRuby-side issue.
28-
# - os: macos-latest
29-
# ruby-version: jruby-9.4
30-
- os: macos-latest
31-
ruby-version: truffleruby
11+
os:
12+
- ubuntu-20.04
13+
- macos-latest
14+
ruby-version:
15+
- 3.0
16+
- 3.1
17+
- 3.2
18+
- jruby-9.4
19+
- truffleruby
3220
runs-on: ${{ matrix.os }}
3321
steps:
3422
- uses: actions/checkout@v2

.rubocop.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ require:
66
- rubocop-rake
77

88
AllCops:
9-
TargetRubyVersion: 2.6
9+
TargetRubyVersion: 3.0
1010
NewCops: enable
1111
Include:
1212
- 'lib/**/*'

0 commit comments

Comments
 (0)