Skip to content

Commit

Permalink
Drop support for End-of-Lifed Rails versions
Browse files Browse the repository at this point in the history
At the time of pull request submission, [official Rails support for
versions `4.2`, `5.0`, and `5.1` have ended][maintenance_policy]

This commit configures the continuous integration test suite to execute
against `5.2` and `6.0`.

To support those versions in our continuous integration containers,
remove configuration code to limit the `bundler` version to `< 2.0`.

Additionally, this commit amends the `README` to mention `5.2` as the
minimally supported version.

[maintenance_policy]: https://guides.rubyonrails.org/maintenance_policy.html
  • Loading branch information
seanpdoyle committed Aug 26, 2020
1 parent b1a4fc3 commit 5ccab75
Show file tree
Hide file tree
Showing 6 changed files with 9 additions and 8 deletions.
5 changes: 1 addition & 4 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,9 @@ jobs:
fail-fast: false
matrix:
ruby: ["2.5", "2.6"]
rails: ["4.2", "5.0", "5.1", "5.2"]
rails: ["5.2", "6.0"]

env:
BUNDLER_VERSION: "1.17.0"
RAILS_ENV: "test"
RAILS_VERSION: "${{ matrix.rails }}"

Expand All @@ -36,8 +35,6 @@ jobs:

- name: "Generate lockfile"
run: |
gem uninstall bundler
gem install bundler -v 1.17.0
bundle config path vendor/bundle
bundle lock
Expand Down
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ master
that end in `/`.
* Don't route requests to `/rails/active_storage` through the mounted Ember application.
* Only support for Ruby versions >= 2.5
* Only support for Rails versions >= 5.2

0.10.0
------
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -661,7 +661,7 @@ This project supports:
This project supports:

* Ruby versions `>= 2.5.0`
* Rails versions `>=4.2.x`.
* Rails versions `>=5.2.x`.

To learn more about supported versions and upgrades, read the [upgrading guide].

Expand Down
3 changes: 3 additions & 0 deletions UPGRADING.md
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,9 @@ longer receives bug fixes of any sort.
From `ember-cli-rails@0.4.0` and on, we will no longer support versions of Rails
prior to `3.2.0`, nor will we support the `4.0.x` series of releases.

From `ember-cli-rails@0.12.0` and on, we will no longer support versions of
Rails prior to `5.2.0`.

To use `ember-cli-rails` with older versions of Rails, try the `0.3.x` series.

[version-policy]: http://guides.rubyonrails.org/maintenance_policy.html
2 changes: 1 addition & 1 deletion bin/setup
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
set -e

echo '-- Set up Ruby dependencies via Bundler'
gem install bundler -v "${BUNDLER_VERSION-1.17.0}" --conservative
gem install bundler --conservative
bundle check || bundle install

bin/rake webdrivers:chromedriver:update
Expand Down
4 changes: 2 additions & 2 deletions spec/lib/ember_cli/ember_constraint_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -46,10 +46,10 @@ def build_request(format:, fullpath: :ignored)
end

def build_html_request(fullpath)
build_request(format: :html, fullpath: fullpath)
build_request(format: "text/html", fullpath: fullpath)
end

def build_json_request
build_request(format: :json)
build_request(format: "application/json")
end
end

0 comments on commit 5ccab75

Please sign in to comment.