diff options
| author | rinpatch <rinpatch@sdf.org> | 2020-06-16 13:18:29 +0000 |
|---|---|---|
| committer | rinpatch <rinpatch@sdf.org> | 2020-06-16 13:18:29 +0000 |
| commit | 8bfacffabc1325fa908f253358bbe29093622b0a (patch) | |
| tree | c4a059fcdfd3db1c3bf1fb7a24055ef05c70f226 | |
| parent | 4baf5ffe739fd99d0e6ab1cd7e22859c14f395c9 (diff) | |
| parent | aca6a7543ae97da2d1af8a6f9c547a0088d9e240 (diff) | |
| download | pleroma-8bfacffabc1325fa908f253358bbe29093622b0a.tar.gz | |
Merge branch 'elixir-1.9' into 'develop'
Upgrade to Elixir 1.9
See merge request pleroma/pleroma!2651
| -rw-r--r-- | .gitlab-ci.yml | 2 | ||||
| -rw-r--r-- | elixir_buildpack.config | 4 | ||||
| -rw-r--r-- | mix.exs | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index aad28a2d8..bc7b289a2 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,4 +1,4 @@ -image: elixir:1.8.1 +image: elixir:1.9.4 variables: &global_variables POSTGRES_DB: pleroma_test diff --git a/elixir_buildpack.config b/elixir_buildpack.config index c23b08fb8..946408c12 100644 --- a/elixir_buildpack.config +++ b/elixir_buildpack.config @@ -1,2 +1,2 @@ -elixir_version=1.8.2 -erlang_version=21.3.7 +elixir_version=1.9.4 +erlang_version=22.3.4.1 @@ -5,7 +5,7 @@ defmodule Pleroma.Mixfile do [ app: :pleroma, version: version("2.0.50"), - elixir: "~> 1.8", + elixir: "~> 1.9", elixirc_paths: elixirc_paths(Mix.env()), compilers: [:phoenix, :gettext] ++ Mix.compilers(), elixirc_options: [warnings_as_errors: warnings_as_errors(Mix.env())], |