Skip to content

Commit 5ccab75

Browse files
committed
Drop support for End-of-Lifed Rails versions
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
1 parent b1a4fc3 commit 5ccab75

File tree

6 files changed

+9
-8
lines changed

6 files changed

+9
-8
lines changed

.github/workflows/tests.yml

+1-4
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,9 @@ jobs:
1414
fail-fast: false
1515
matrix:
1616
ruby: ["2.5", "2.6"]
17-
rails: ["4.2", "5.0", "5.1", "5.2"]
17+
rails: ["5.2", "6.0"]
1818

1919
env:
20-
BUNDLER_VERSION: "1.17.0"
2120
RAILS_ENV: "test"
2221
RAILS_VERSION: "${{ matrix.rails }}"
2322

@@ -36,8 +35,6 @@ jobs:
3635

3736
- name: "Generate lockfile"
3837
run: |
39-
gem uninstall bundler
40-
gem install bundler -v 1.17.0
4138
bundle config path vendor/bundle
4239
bundle lock
4340

CHANGELOG.md

+1
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ master
99
that end in `/`.
1010
* Don't route requests to `/rails/active_storage` through the mounted Ember application.
1111
* Only support for Ruby versions >= 2.5
12+
* Only support for Rails versions >= 5.2
1213

1314
0.10.0
1415
------

README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -661,7 +661,7 @@ This project supports:
661661
This project supports:
662662

663663
* Ruby versions `>= 2.5.0`
664-
* Rails versions `>=4.2.x`.
664+
* Rails versions `>=5.2.x`.
665665

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

UPGRADING.md

+3
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,9 @@ longer receives bug fixes of any sort.
3131
From `[email protected]` and on, we will no longer support versions of Rails
3232
prior to `3.2.0`, nor will we support the `4.0.x` series of releases.
3333

34+
From `[email protected]` and on, we will no longer support versions of
35+
Rails prior to `5.2.0`.
36+
3437
To use `ember-cli-rails` with older versions of Rails, try the `0.3.x` series.
3538

3639
[version-policy]: http://guides.rubyonrails.org/maintenance_policy.html

bin/setup

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
set -e
44

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

99
bin/rake webdrivers:chromedriver:update

spec/lib/ember_cli/ember_constraint_spec.rb

+2-2
Original file line numberDiff line numberDiff line change
@@ -46,10 +46,10 @@ def build_request(format:, fullpath: :ignored)
4646
end
4747

4848
def build_html_request(fullpath)
49-
build_request(format: :html, fullpath: fullpath)
49+
build_request(format: "text/html", fullpath: fullpath)
5050
end
5151

5252
def build_json_request
53-
build_request(format: :json)
53+
build_request(format: "application/json")
5454
end
5555
end

0 commit comments

Comments
 (0)