From b356fb2b093976ddc01c19ef8536185292a16c3e Mon Sep 17 00:00:00 2001
From: Thomas Citharel <tcit@tcit.fr>
Date: Tue, 16 Mar 2021 11:07:44 +0100
Subject: [PATCH 1/2] Fix release generation path
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
---
.gitlab-ci.yml | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 3666466ae..a0dfb27c4 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -213,8 +213,8 @@ package-app:
- mix local.rebar --force
- mix deps.get
- mix phx.digest
- - mix release --path release
- - cd release && ln -s lib/mobilizon-*/priv priv
+ - mix release --path release/mobilizon
+ - cd release/mobilizon && ln -s lib/mobilizon-*/priv priv
only:
- tags@framasoft/mobilizon
artifacts:
@@ -243,7 +243,7 @@ release-upload:
APP_ASSET="${CI_PROJECT_NAME}_${APP_VERSION}_${ARCH}.tar.gz"
echo "Artifact: ${APP_ASSET}"
- tar czf ${APP_ASSET} -C release .
+ tar czf ${APP_ASSET} -C release mobilizon
ls -al ${APP_ASSET}
curl --silent --show-error --header "JOB-TOKEN: ${CI_JOB_TOKEN}" --upload-file "${APP_ASSET}" ${PACKAGE_REGISTRY_URL}/${APP_VERSION}/${APP_ASSET}
From c09a43f71ee7dfd70612d08dfad02a239eeaaa13 Mon Sep 17 00:00:00 2001
From: Thomas Citharel <tcit@tcit.fr>
Date: Tue, 16 Mar 2021 11:08:04 +0100
Subject: [PATCH 2/2] Get front-end index path at runtime instead of
compile-time
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
---
lib/web/views/utils.ex | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/lib/web/views/utils.ex b/lib/web/views/utils.ex
index c21e2bf3a..043727116 100644
--- a/lib/web/views/utils.ex
+++ b/lib/web/views/utils.ex
@@ -7,13 +7,12 @@ defmodule Mobilizon.Web.Views.Utils do
import Mobilizon.Web.Gettext, only: [dgettext: 2]
import Plug.Conn, only: [put_status: 2, halt: 1]
- @index_file_path Path.join(Application.app_dir(:mobilizon, "priv/static"), "index.html")
-
# sobelow_skip ["Traversal.FileModule"]
@spec inject_tags(Enum.t(), String.t()) :: {:ok, {:safe, String.t()}}
def inject_tags(tags, locale \\ "en") do
- with {:exists, true} <- {:exists, File.exists?(@index_file_path)},
- {:ok, index_content} <- File.read(@index_file_path),
+ with path <- Path.join(Application.app_dir(:mobilizon, "priv/static"), "index.html"),
+ {:exists, true} <- {:exists, File.exists?(path)},
+ {:ok, index_content} <- File.read(path),
safe <- do_replacements(index_content, MetadataUtils.stringify_tags(tags), locale) do
{:ok, {:safe, safe}}
else