diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 7ceaef65e3..4581b950f4 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -13,11 +13,17 @@ jobs: strategy: matrix: include: - - elixir: 1.12.0 + - elixir: 1.11.4 otp: 22.3 - - elixir: 1.14.3 - otp: 25.1 + - elixir: 1.12.3 + otp: 23.3 + + - elixir: 1.14.5 + otp: 25.3 + + - elixir: 1.16.0 + otp: 26.2 lint: true installer: true diff --git a/CHANGELOG.md b/CHANGELOG.md index 94a0a4a64e..6358940821 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,7 +2,7 @@ See the [upgrade guide](https://gist.github.com/chrismccord/00a6ea2a96bc57df0cce526bd20af8a7) to upgrade from Phoenix 1.6.x. -Phoenix v1.7 requires Elixir v1.11+. +Phoenix v1.7 requires Elixir v1.11+ & Erlang v22.1+. ## Introduction of Verified Routes diff --git a/README.md b/README.md index e84e2fbff7..4cfa8d1d7a 100644 --- a/README.md +++ b/README.md @@ -30,6 +30,8 @@ See the official site at . Install the latest version of Phoenix by following the instructions at . +Phoenix requires Elixir v1.11+ & Erlang v22.1+. + ## Documentation API documentation is available at . diff --git a/lib/phoenix/endpoint/cowboy2_adapter.ex b/lib/phoenix/endpoint/cowboy2_adapter.ex index 2356e26bd1..94e11f951b 100644 --- a/lib/phoenix/endpoint/cowboy2_adapter.ex +++ b/lib/phoenix/endpoint/cowboy2_adapter.ex @@ -139,9 +139,12 @@ defmodule Phoenix.Endpoint.Cowboy2Adapter do defp port_to_integer(port) when is_integer(port), do: port def server_info(endpoint, scheme) do - make_ref(endpoint, scheme) - |> :ranch.get_addr() - |> then(&{:ok, &1}) + address = + endpoint + |> make_ref(scheme) + |> :ranch.get_addr() + + {:ok, address} rescue e -> {:error, e.message} end