From faf58d0f391170305107bb1c43cdfd03af3129c3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Valim?= Date: Mon, 17 Feb 2025 15:24:45 +0100 Subject: [PATCH] Use :public_key.cacerts_get, closes #6066 (#6067) * Use :public_key.cacerts_get, closes #6066 * Bump OTP --- .github/workflows/ci.yml | 4 ++-- CHANGELOG.md | 2 ++ lib/mix/tasks/phx.gen.release.ex | 2 +- mix.exs | 2 -- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index da6626aafd..971c6fd668 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -15,7 +15,7 @@ jobs: matrix: include: - elixir: 1.15.8 - otp: 24.3.4.17 + otp: 25.3.2.9 - elixir: 1.17.3 otp: 27.2 @@ -107,7 +107,7 @@ jobs: include: # look for correct alpine image here: https://hub.docker.com/r/hexpm/elixir/tags - elixir: 1.15.8 - otp: 24.3.4.17 + otp: 25.3.2.9 suffix: "alpine-3.20.3" - elixir: 1.17.3 diff --git a/CHANGELOG.md b/CHANGELOG.md index 2cc0b330c2..ca4cfe9d8e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,7 @@ # Changelog for v1.8 +This release requires Erlang/OTP 25+. + ## v1.7 The CHANGELOG for v1.7 releases can be found in the [v1.7 branch](https://github.com/phoenixframework/phoenix/blob/v1.7/CHANGELOG.md). diff --git a/lib/mix/tasks/phx.gen.release.ex b/lib/mix/tasks/phx.gen.release.ex index 3f93149e9e..9f8ad9fdf6 100644 --- a/lib/mix/tasks/phx.gen.release.ex +++ b/lib/mix/tasks/phx.gen.release.ex @@ -294,7 +294,7 @@ defmodule Mix.Tasks.Phx.Gen.Release do http_options = [ ssl: [ verify: :verify_peer, - cacertfile: String.to_charlist(CAStore.file_path()), + cacerts: :public_key.cacerts_get(), depth: 3, customize_hostname_check: [ match_fun: :public_key.pkix_verify_hostname_match_fun(:https) diff --git a/mix.exs b/mix.exs index 07b42f097f..7746927fa3 100644 --- a/mix.exs +++ b/mix.exs @@ -88,8 +88,6 @@ defmodule Phoenix.MixProject do # TODO Drop phoenix_view as an optional dependency in Phoenix v2.0 {:phoenix_view, "~> 2.0", optional: true}, - # TODO Drop castore when we require OTP 25+ / Elixir v1.17+ - {:castore, ">= 0.0.0"}, # Optional deps {:plug_cowboy, "~> 2.7", optional: true},