From 8bb8dd477906bd0980ebe4a7c2b1877d2c61ef9f Mon Sep 17 00:00:00 2001
From: Tom Teichler <tom.teichler@teckids.org>
Date: Fri, 13 Nov 2020 22:55:57 +0100
Subject: [PATCH] Use CI_COMMIT_TIMESTAMP instead of date %s.
---
ci/build_dist.yml | 12 ++----------
ci/deploy_pypi.yml | 6 +++---
2 files changed, 5 insertions(+), 13 deletions(-)
diff --git a/ci/build_dist.yml b/ci/build_dist.yml
index ec4a102bf..b0c1bcc43 100644
--- a/ci/build_dist.yml
+++ b/ci/build_dist.yml
@@ -1,18 +1,10 @@
build_dist:
stage: build
script:
- - if [ $CI_COMMIT_REF_NAME = master ]; then
- poetry version $(poetry version | cut -d" " -f2)+$(date +%s).${CI_COMMIT_SHORT_SHA} ;
- elif [ x$CI_OMMIT_REF_NAME = x$CI_COMMIT_TAG ]; then
- if ! [ "$(poetry version | cut -d" " -f2)" = $CI_COMMIT_REF_NAME ]; then
- echo "Package version does not match tag. Aborting build of tag!" >/dev/fd/2 ;
- exit 1 ;
- fi ;
+ - 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
- tox -e build
artifacts:
paths:
- dist/
- only:
- - master
- - tags
diff --git a/ci/deploy_pypi.yml b/ci/deploy_pypi.yml
index c5c4b0d85..1d388e356 100644
--- a/ci/deploy_pypi.yml
+++ b/ci/deploy_pypi.yml
@@ -2,8 +2,8 @@ deploy_pypi:
stage: deploy
script:
- if [ $CI_COMMIT_REF_NAME = master ]; then
- poetry version $(poetry version | cut -d" " -f2)+$(date +%s).${CI_COMMIT_SHORT_SHA} ;
- elif [ x$CI_OMMIT_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} ;
+ elif [ x$CI_COMMIT_REF_NAME = x$CI_COMMIT_TAG ]; then
if ! [ "$(poetry version | cut -d" " -f2)" = $CI_COMMIT_REF_NAME ]; then
echo "Package version does not match tag. Aborting build of tag!" >/dev/fd/2 ;
exit 1 ;
@@ -11,7 +11,7 @@ deploy_pypi:
fi
- if [ $CI_COMMIT_REF_NAME = master ]; then
poetry publish -r gitlab ;
- elif [ x$CI_OMMIT_REF_NAME = x$CI_COMMIT_TAG ]; then
+ elif [ x$CI_COMMIT_REF_NAME = x$CI_COMMIT_TAG ]; then
poetry publish ;
fi
only:
--
GitLab