Skip to content

Commit

Permalink
Merge pull request #266 from oauth-xx/265/fix-build
Browse files Browse the repository at this point in the history
👷 Drop Rails 3 & 4
  • Loading branch information
pboling authored Aug 23, 2022
2 parents cf222a7 + 6661d92 commit bd834d2
Show file tree
Hide file tree
Showing 14 changed files with 18 additions and 293 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ jobs:

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

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

- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@v1
uses: github/codeql-action/analyze@v2
2 changes: 1 addition & 1 deletion .github/workflows/coverage.yml
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ jobs:
hide_complexity: true
indicators: true
output: both
thresholds: '86 88'
thresholds: '78 40'
continue-on-error: ${{ matrix.experimental != 'false' }}

- name: Add Coverage PR Comment
Expand Down
70 changes: 0 additions & 70 deletions .github/workflows/jruby-head.yml

This file was deleted.

58 changes: 0 additions & 58 deletions .github/workflows/macos-ancient.yml

This file was deleted.

1 change: 0 additions & 1 deletion .github/workflows/macos.yml
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,6 @@ jobs:
- "3.0"
- "3.1"
- truffleruby
- jruby

runs-on: macos-latest
continue-on-error: ${{ matrix.experimental || endsWith(matrix.ruby, 'head') }}
Expand Down
71 changes: 0 additions & 71 deletions .github/workflows/rails-supported.yml

This file was deleted.

63 changes: 0 additions & 63 deletions .github/workflows/rails-unsupported.yml

This file was deleted.

16 changes: 11 additions & 5 deletions .github/workflows/supported.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,19 +32,25 @@ jobs:
fail-fast: false
matrix:
experimental: [false]
gemfile:
- a7
rubygems:
- latest
bundler:
- latest
gemfile:
- a5
- a6
- a7
ruby:
- "2.7"
- "3.0"
- "3.1"
- truffleruby
# @todo: Turn JRuby back on https://github.com/oauth-xx/oauth-ruby/runs/5752587195?check_suite_focus=true
# - jruby
exclude:
- ruby: "3.0"
gemfile: "a7"
- ruby: "3.1"
gemfile: "a5"
- ruby: "3.1"
gemfile: "a6"

runs-on: ubuntu-latest
continue-on-error: ${{ matrix.experimental || endsWith(matrix.ruby, 'head') }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/unsupported.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ jobs:
strategy:
fail-fast: false
matrix:
experimental: [false]
experimental: [true]
gemfile:
- a5
rubygems:
Expand Down
1 change: 0 additions & 1 deletion .github/workflows/windows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,6 @@ jobs:
- "2.7"
- "3.0"
- "3.1"
- jruby

runs-on: windows-latest
continue-on-error: ${{ matrix.experimental || endsWith(matrix.ruby, 'head') }}
Expand Down
1 change: 1 addition & 0 deletions .simplecov
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ if RUN_COVERAGE
enable_coverage :branch
primary_coverage :branch
add_filter "test"
add_filter "lib/oauth/version.rb"
track_files "**/*.rb"

if ALL_FORMATTERS
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -193,7 +193,7 @@ NOTE: If there is another 0.5.x release it is anticipated to be the last of the
<details>
<summary>Ruby Engine Compatibility Policy</summary>

This gem is tested against MRI, JRuby, and Truffleruby.
This gem is tested against MRI, and to a lesser extent, against JRuby, and Truffleruby.
Each of those has varying versions that target a specific version of MRI Ruby.
This gem should work in the just-listed Ruby engines according to the targeted MRI compatibility in the table below.
If you would like to add support for additional engines,
Expand Down
9 changes: 0 additions & 9 deletions gemfiles/a3.gemfile

This file was deleted.

9 changes: 0 additions & 9 deletions gemfiles/a4.gemfile

This file was deleted.

0 comments on commit bd834d2

Please sign in to comment.