From 66543982136f73eea1385fa228b7b5bae43c6f0e Mon Sep 17 00:00:00 2001 From: Jared Kipe Date: Sat, 17 Oct 2020 15:08:49 -0700 Subject: [PATCH] Backport Gitlab CI improvements from 13.0 --- .gitlab-ci.yml | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index a85a9629..53e43c6f 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -4,6 +4,7 @@ services: stages: - build + - release - trigger variables: @@ -15,7 +16,9 @@ variables: before_script: - RELEASE=$(echo $CI_COMMIT_REF_NAME | sed "s{.*\/\(.*\)\/.*{\1{g") + - RELEASE_DATE="$(date '+%Y-%m-%d')" - IMAGE_TAG=$(echo $CI_COMMIT_REF_SLUG | sed "s/^\([[:digit:]][[:digit:]]\)-\([[:digit:]]\)/\1\.\2/g") + - IMAGE_TAG_DATE="${IMAGE_TAG}-${RELEASE_DATE}" - docker login -u gitlab-ci-token -p $CI_JOB_TOKEN registry.gitlab.com merge_request: @@ -40,6 +43,20 @@ build: - docker build --pull -t $CONTAINER_IMAGE:$IMAGE_TAG -f Dockerfile-GitLab . - docker push $CONTAINER_IMAGE:$IMAGE_TAG +release: + stage: release + variables: + GIT_STRATEGY: none + script: + - apk add python3 + - docker pull registry.gitlab.com/hibou-io/hibou-odoo/flow + - docker tag registry.gitlab.com/hibou-io/hibou-odoo/flow flow + - docker run -v "${PWD}/.local:/dest" flow self-install /dest + - cd .local/flow + - ./entrypoint.sh docker-release $CONTAINER_IMAGE:$IMAGE_TAG $CONTAINER_IMAGE:$IMAGE_TAG_DATE + only: + - /^\d+\.\d+$/ + publish: stage: build script: