Skip to content

Commit bd834d2

Browse files
authored
Merge pull request #266 from oauth-xx/265/fix-build
👷 Drop Rails 3 & 4
2 parents cf222a7 + 6661d92 commit bd834d2

File tree

14 files changed

+18
-293
lines changed

14 files changed

+18
-293
lines changed

.github/workflows/codeql-analysis.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ jobs:
4242

4343
# Initializes the CodeQL tools for scanning.
4444
- name: Initialize CodeQL
45-
uses: github/codeql-action/init@v1
45+
uses: github/codeql-action/init@v2
4646
with:
4747
languages: ${{ matrix.language }}
4848
# If you wish to specify custom queries, you can do so here or in a config file.
@@ -53,7 +53,7 @@ jobs:
5353
# Autobuild attempts to build any compiled languages (C/C++, C#, or Java).
5454
# If this step fails, then you should remove it and run the build manually (see below)
5555
- name: Autobuild
56-
uses: github/codeql-action/autobuild@v1
56+
uses: github/codeql-action/autobuild@v2
5757

5858
# ℹ️ Command-line programs to run using the OS shell.
5959
# 📚 https://git.io/JvXDl
@@ -67,4 +67,4 @@ jobs:
6767
# make release
6868

6969
- name: Perform CodeQL Analysis
70-
uses: github/codeql-action/analyze@v1
70+
uses: github/codeql-action/analyze@v2

.github/workflows/coverage.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ jobs:
9494
hide_complexity: true
9595
indicators: true
9696
output: both
97-
thresholds: '86 88'
97+
thresholds: '78 40'
9898
continue-on-error: ${{ matrix.experimental != 'false' }}
9999

100100
- name: Add Coverage PR Comment

.github/workflows/jruby-head.yml

Lines changed: 0 additions & 70 deletions
This file was deleted.

.github/workflows/macos-ancient.yml

Lines changed: 0 additions & 58 deletions
This file was deleted.

.github/workflows/macos.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,6 @@ jobs:
4343
- "3.0"
4444
- "3.1"
4545
- truffleruby
46-
- jruby
4746

4847
runs-on: macos-latest
4948
continue-on-error: ${{ matrix.experimental || endsWith(matrix.ruby, 'head') }}

.github/workflows/rails-supported.yml

Lines changed: 0 additions & 71 deletions
This file was deleted.

.github/workflows/rails-unsupported.yml

Lines changed: 0 additions & 63 deletions
This file was deleted.

.github/workflows/supported.yml

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -32,19 +32,25 @@ jobs:
3232
fail-fast: false
3333
matrix:
3434
experimental: [false]
35-
gemfile:
36-
- a7
3735
rubygems:
3836
- latest
3937
bundler:
4038
- latest
39+
gemfile:
40+
- a5
41+
- a6
42+
- a7
4143
ruby:
4244
- "2.7"
4345
- "3.0"
4446
- "3.1"
45-
- truffleruby
46-
# @todo: Turn JRuby back on https://github.com/oauth-xx/oauth-ruby/runs/5752587195?check_suite_focus=true
47-
# - jruby
47+
exclude:
48+
- ruby: "3.0"
49+
gemfile: "a7"
50+
- ruby: "3.1"
51+
gemfile: "a5"
52+
- ruby: "3.1"
53+
gemfile: "a6"
4854

4955
runs-on: ubuntu-latest
5056
continue-on-error: ${{ matrix.experimental || endsWith(matrix.ruby, 'head') }}

.github/workflows/unsupported.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ jobs:
3131
strategy:
3232
fail-fast: false
3333
matrix:
34-
experimental: [false]
34+
experimental: [true]
3535
gemfile:
3636
- a5
3737
rubygems:

.github/workflows/windows.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,6 @@ jobs:
4242
- "2.7"
4343
- "3.0"
4444
- "3.1"
45-
- jruby
4645

4746
runs-on: windows-latest
4847
continue-on-error: ${{ matrix.experimental || endsWith(matrix.ruby, 'head') }}

0 commit comments

Comments
 (0)