From eabde15f8285070195c5799893ad42686a98d0bf Mon Sep 17 00:00:00 2001 From: Tom Teichler <tom.teichler@teckids.org> Date: Sun, 23 May 2021 21:30:24 +0200 Subject: [PATCH] Run on merge requests --- .gitlab-ci.yml | 1 + ci/build/meta.yml | 4 +--- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 99361e56..79cd0a66 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,6 +1,7 @@ include: - local: "/ci/general.yml" - local: "/ci/build/meta.yml" + - local: "/ci/publish/meta.yml" - local: "/ci/integration/test.yml" - local: "/ci/docker/dist.yml" #- local: "/ci/deploy/demo.yml" diff --git a/ci/build/meta.yml b/ci/build/meta.yml index cedb1782..80593f16 100644 --- a/ci/build/meta.yml +++ b/ci/build/meta.yml @@ -9,12 +9,10 @@ build_metapackages: cd $dir; if ! [ x$CI_COMMIT_REF_NAME = x$CI_COMMIT_TAG ]; then poetry version $(poetry version | cut -d" " -f2)+$(date --date=${CI_COMMIT_TIMESTAMP} +%Y%m%d%H%M%S).${CI_COMMIT_SHORT_SHA} ; - fi + fi; poetry build; cd -; done - only: - - master artifacts: paths: - meta/*/dist/ -- GitLab