diff options
| author | Haelwenn <contact+git.pleroma.social@hacktivis.me> | 2019-07-01 04:51:56 +0000 |
|---|---|---|
| committer | Haelwenn <contact+git.pleroma.social@hacktivis.me> | 2019-07-01 04:51:56 +0000 |
| commit | ce827a1626a56ce8574cf13d29c6a3d799d3e80d (patch) | |
| tree | 387ed6dedb836960bef153f42dc59b4fdd0832b4 | |
| parent | 47efe52c50e6c9e237b2a81b9577b829445c3e3b (diff) | |
| parent | bdc1592377d19da67040a78faf360770c54d4e6a (diff) | |
| download | pleroma-ce827a1626a56ce8574cf13d29c6a3d799d3e80d.tar.gz | |
Merge branch 'ci-improvements' into 'develop'
Add PLEROMA_BUILD_ENV to override env for the version generator and use it in the CI for building docs
See merge request pleroma/pleroma!1360
| -rw-r--r-- | .gitlab-ci.yml | 1 | ||||
| -rw-r--r-- | mix.exs | 9 |
2 files changed, 10 insertions, 0 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index f8711f299..d0c540b16 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -35,6 +35,7 @@ docs-build: - develop@pleroma/pleroma variables: MIX_ENV: dev + PLEROMA_BUILD_ENV: prod script: - mix deps.get - mix compile @@ -207,6 +207,15 @@ defmodule Pleroma.Mixfile do env_name = if Mix.env() != :prod, do: to_string(Mix.env()) + env_override = System.get_env("PLEROMA_BUILD_ENV") + + env_name = + if env_override do + if env_override != "prod", do: env_override + else + env_name + end + build = [build_name, env_name] |> Enum.filter(fn string -> string && string != "" end) |