From 491a40460f32f1d0893f6bd7899907c560e5dc92 Mon Sep 17 00:00:00 2001 From: Thomas Citharel Date: Wed, 27 Jan 2021 11:42:46 +0100 Subject: [PATCH 1/9] Fix package-app job when used with other jobs Signed-off-by: Thomas Citharel --- .gitlab-ci.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 7beac896a..706f70a1c 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -205,15 +205,13 @@ build-docker-tag: package-app: stage: package - before_script: - - apt update - - apt install -y --no-install-recommends build-essential git cmake variables: MIX_ENV: "prod" script: - mix local.hex --force - mix local.rebar --force - cp docker/production/releases.exs ./config/ + - mix deps.get - mix phx.digest - mix release artifacts: From 773ae753736d537d8c9dc4541d650510873db66f Mon Sep 17 00:00:00 2001 From: Thomas Citharel Date: Wed, 27 Jan 2021 11:43:12 +0100 Subject: [PATCH 2/9] Disable release-create job for now Need to rethink how releases are created first Signed-off-by: Thomas Citharel --- .gitlab-ci.yml | 27 +++++++++++++-------------- 1 file changed, 13 insertions(+), 14 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 706f70a1c..79f02f5cf 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -238,18 +238,17 @@ release-upload: when: on_success paths: - mobilizon_*.tar.gz +# release-create: +# stage: deploy +# image: registry.gitlab.com/gitlab-org/release-cli:latest +# rules: +# - if: $CI_COMMIT_TAG +# dependencies: [] +# cache: {} +# script: | +# APP_VERSION="${CI_COMMIT_TAG}" +# APP_ASSET="${CI_PROJECT_NAME}_${APP_VERSION}_${ARCH}.tar.gz" -release-create: - stage: deploy - image: registry.gitlab.com/gitlab-org/release-cli:latest - rules: - - if: $CI_COMMIT_TAG - dependencies: [] - cache: {} - script: | - APP_VERSION="${CI_COMMIT_TAG}" - APP_ASSET="${CI_PROJECT_NAME}_${APP_VERSION}_${ARCH}.tar.gz" - - release-cli create --name "$CI_PROJECT_TITLE v$CI_COMMIT_TAG" \ - --tag-name "$CI_COMMIT_TAG" \ - --assets-link "{\"name\":\"${APP_ASSET}\",\"url\":\"${PACKAGE_REGISTRY_URL}/${APP_VERSION}/${APP_ASSET}\"}" +# release-cli create --name "$CI_PROJECT_TITLE v$CI_COMMIT_TAG" \ +# --tag-name "$CI_COMMIT_TAG" \ +# --assets-link "{\"name\":\"${APP_ASSET}\",\"url\":\"${PACKAGE_REGISTRY_URL}/${APP_VERSION}/${APP_ASSET}\"}" From 5edc402a011a81ae898795222569f270f93f2a77 Mon Sep 17 00:00:00 2001 From: Thomas Citharel Date: Wed, 3 Feb 2021 09:34:22 +0100 Subject: [PATCH 3/9] Fix showing event origin when the event organizer is a group Related to !806 and #561 Signed-off-by: Thomas Citharel --- js/src/views/Event/Event.vue | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/js/src/views/Event/Event.vue b/js/src/views/Event/Event.vue index 290dee24f..b8d688e78 100755 --- a/js/src/views/Event/Event.vue +++ b/js/src/views/Event/Event.vue @@ -125,9 +125,9 @@

-