diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 69c865a65..ca01f5b38 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -242,8 +242,9 @@ package-app: script: &release-script - mix local.hex --force - mix local.rebar --force - - mix deps.get - - mix phx.digest + - mix deps.get --only-prod + - mix compile + - mix phx.digest.clean --all && \ - mix release --path release/mobilizon - cd release/mobilizon && ln -s lib/mobilizon-*/priv priv && cd ../../ - du -sh release/ @@ -312,21 +313,27 @@ multi-arch-release: when: never - if: '$CI_PIPELINE_SOURCE == "schedule"' - if: $CI_COMMIT_TAG + timeout: 3h # Release release-upload: stage: upload image: framasoft/yakforms-assets-deploy:latest + variables: + APP_ASSET: "${CI_PROJECT_NAME}_${CI_COMMIT_REF_NAME}_${ARCH}.tar.gz" rules: *tag-rules script: - eval `ssh-agent -s` - ssh-add <(echo "${DEPLOYEMENT_KEY}" | base64 --decode -i) - - echo "put -r mobilizon_*.tar.gz" | sftp -o "VerifyHostKeyDNS yes" ${DEPLOYEMENT_USER}@${DEPLOYEMENT_HOST}:public/ + - echo "put -r ${APP_ASSET}" | sftp -o "VerifyHostKeyDNS yes" ${DEPLOYEMENT_USER}@${DEPLOYEMENT_HOST}:public/ artifacts: expire_in: 1 day when: on_success paths: - mobilizon_*.tar.gz + parallel: + matrix: + - ARCH: ["amd64", "arm", "arm64"] release-create: stage: deploy diff --git a/config/config.exs b/config/config.exs index 9d0aabaf8..62ec966ec 100644 --- a/config/config.exs +++ b/config/config.exs @@ -196,7 +196,8 @@ config :mobilizon, :cldr, locales: [ "fr", "en", - "ru" + "ru", + "ar" ] config :mobilizon, :activitypub, diff --git a/config/dev.exs b/config/dev.exs index 0484b983e..d7a28a2ac 100644 --- a/config/dev.exs +++ b/config/dev.exs @@ -58,7 +58,7 @@ config :logger, :console, format: "[$level] $message\n", level: :debug config :mobilizon, Mobilizon.Service.Geospatial, service: Mobilizon.Service.Geospatial.Nominatim -config :mobilizon, Mobilizon.Web.Gettext, allowed_locales: ["fr", "en", "ar"] +config :mobilizon, Mobilizon.Web.Gettext, allowed_locales: ["fr", "en", "ru", "ar"] # Set a higher stacktrace during development. Avoid configuring such # in production as building large stacktraces may be expensive. diff --git a/docker/production/Dockerfile b/docker/production/Dockerfile index c9ec24183..2a55efba9 100644 --- a/docker/production/Dockerfile +++ b/docker/production/Dockerfile @@ -30,7 +30,7 @@ COPY rel ./rel COPY support ./support COPY --from=assets ./priv/static ./priv/static -RUN mix phx.digest \ +RUN mix phx.digest.clean --all \ && mix release # Finally setup the app diff --git a/js/src/components/Event/EventFullDate.vue b/js/src/components/Event/EventFullDate.vue index 33c1d6176..8708993ad 100644 --- a/js/src/components/Event/EventFullDate.vue +++ b/js/src/components/Event/EventFullDate.vue @@ -111,6 +111,7 @@