Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Drop support for EOL'd Ruby versions 2.6 and earlier #1454

Merged
merged 1 commit into from
Jul 12, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 1 addition & 20 deletions .github/workflows/octokit.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,18 +26,8 @@ jobs:
fail-fast: false
matrix:
os: [ ubuntu ]
ruby: [ 2.3, 2.4, 2.5, 2.6, 2.7, '3.0', '3.1', head ]
ruby: [ 2.7, '3.0', '3.1', head ]
faraday: [ '~> 1.0', '~> 2.0' ]
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I am pretty sure we can get rid of the 1.0 reference here... Let me know if that sounds right.

Suggested change
faraday: [ '~> 1.0', '~> 2.0' ]
faraday: '~> 2.0'

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We can still continue to support Faraday 1.x. Dropping support for Faraday 1.x is often pretty painful as there are lots of packages out there that still require it.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Got it... 👍

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I am pretty sure we can get rid of the 1.0 reference here... Let me know if that sounds right.

Suggested change
faraday: [ '~> 1.0', '~> 2.0' ]
faraday: '~> 2.0'

exclude:
# Faraday 2.x only works with Ruby versions 2.6 onwards.
# Fortunately, the gem supports Faraday 1.x, so we can just
# test against that.
- ruby: 2.5
faraday: '~> 2.0'
- ruby: 2.4
faraday: '~> 2.0'
- ruby: 2.3
faraday: '~> 2.0'
env:
FARADAY_VERSION: ${{ matrix.faraday }}

Expand All @@ -56,9 +46,6 @@ jobs:
ruby-version: ${{ matrix.ruby }}
- name: Setup .netrc
run: chmod 600 spec/fixtures/.netrc
- name: Ruby 2.5 and earlier need a newer RubyGems to support frozen-string-literal
if: ${{ matrix.ruby == '2.5' || matrix.ruby == '2.4' || matrix.ruby == '2.3' }}
run: gem update --system 2.7.11
- name: Install dependencies
run: |
bundle config set path .bundle/gems
Expand All @@ -69,12 +56,6 @@ jobs:
GITHUB_CI: 1
RUBYOPT: --enable-frozen-string-literal
run: bundle exec rspec -w
if: ${{ matrix.ruby != '2.3' }}
- name: Test with RSpec without frozen string literals enabled
env:
GITHUB_CI: 1
run: bundle exec rspec -w
if: ${{ matrix.ruby == '2.3' }}
- name: Lint with Rubocop
env:
GITHUB_CI: 1
Expand Down
2 changes: 0 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -740,8 +740,6 @@ when writing new specs.
This library aims to support and is [tested against][actions] the following Ruby
implementations:

* Ruby 2.5
* Ruby 2.6
* Ruby 2.7
* Ruby 3.0
* Ruby 3.1
Expand Down
2 changes: 1 addition & 1 deletion octokit.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ Gem::Specification.new do |spec|
spec.licenses = ['MIT']
spec.name = 'octokit'
spec.require_paths = ['lib']
spec.required_ruby_version = '>= 2.0.0'
spec.required_ruby_version = '>= 2.7.0'
spec.required_rubygems_version = '>= 1.3.5'
spec.summary = 'Ruby toolkit for working with the GitHub API'
spec.version = Octokit::VERSION.dup
Expand Down