diff --git a/.woodpecker/docker.yaml b/.woodpecker/docker.yaml index 1bcf1d2ed..bdfec6a61 100644 --- a/.woodpecker/docker.yaml +++ b/.woodpecker/docker.yaml @@ -31,7 +31,7 @@ variables: <<: *docker_variables build_args: - ELIXIR_IMG=docker.io/arm32v7/elixir - - ELIXIR_TAG=1.17.3-otp-26-alpine + - ELIXIR_TAG=1.17.3-otp-27-alpine - ALPINE_IMG=docker.io/arm32v7/alpine - ALPINE_VER=3.20 extra_opts: --custom-platform=linux/arm/v7 diff --git a/.woodpecker/lint.yaml b/.woodpecker/lint.yaml index 8a5718c5d..1ed040440 100644 --- a/.woodpecker/lint.yaml +++ b/.woodpecker/lint.yaml @@ -18,7 +18,7 @@ variables: steps: mix-format: image: &elixir-image - docker.io/elixir:1.15-alpine + docker.io/elixir:1.17-otp-27-alpine entrypoint: *script_file_entrypoint failure: ignore commands: diff --git a/.woodpecker/unit-testing-elixir-1.15.yaml b/.woodpecker/unit-testing-elixir-1.17.yaml similarity index 95% rename from .woodpecker/unit-testing-elixir-1.15.yaml rename to .woodpecker/unit-testing-elixir-1.17.yaml index 13eb40244..020bacb8c 100644 --- a/.woodpecker/unit-testing-elixir-1.15.yaml +++ b/.woodpecker/unit-testing-elixir-1.17.yaml @@ -19,8 +19,8 @@ variables: - 'printf "%s" "$CI_SCRIPT" | base64 -d > /tmp/ci-script.sh && /bin/sh -xe /tmp/ci-script.sh' steps: - unit-testing-elixir-1.15: - image: elixir:1.15-alpine + unit-testing-elixir-1.17: + image: elixir:1.17-otp-27-alpine entrypoint: *script_file_entrypoint environment: MIX_ENV: test diff --git a/Dockerfile b/Dockerfile index 87c698f93..4018d9bc9 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ # https://hub.docker.com/r/hexpm/elixir/tags ARG ELIXIR_IMG=hexpm/elixir ARG ELIXIR_VER=1.17.3 -ARG ERLANG_VER=27.3.4.14 +ARG ERLANG_VER=27.3.4.17 ARG ALPINE_VER=3.23.5 ARG ELIXIR_TAG=${ELIXIR_VER}-erlang-${ERLANG_VER}-alpine-${ALPINE_VER} ARG ALPINE_IMG=alpine diff --git a/docs/installation/generic_dependencies.include b/docs/installation/generic_dependencies.include index 382f07a6c..3027e9025 100644 --- a/docs/installation/generic_dependencies.include +++ b/docs/installation/generic_dependencies.include @@ -1,8 +1,8 @@ ## Required dependencies * PostgreSQL >=11.0 -* Elixir >=1.15.0, <1.20 -* Erlang OTP >=24.0.0 (supported: <29) +* Elixir >=1.17.0, <1.20 +* Erlang OTP >=27.0.0 (supported: <29) * git * file / libmagic * gcc or clang diff --git a/mix.exs b/mix.exs index b24ac6e5b..d323d478f 100644 --- a/mix.exs +++ b/mix.exs @@ -5,7 +5,7 @@ defmodule Pleroma.Mixfile do [ app: :pleroma, version: version("2.10.2"), - elixir: "~> 1.15", + elixir: "~> 1.17", elixirc_paths: elixirc_paths(Mix.env()), compilers: Mix.compilers(), elixirc_options: [warnings_as_errors: warnings_as_errors(), prune_code_paths: false],