diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index eb40472..46054b2 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -3,12 +3,12 @@ build: key: cache paths: [.cache] image: yourlabs/shlax - script: ./shlaxfile.py build + script: CACHE_DIR=$(pwd)/.cache ./shlaxfile.py -d shlax build push stage: build pypi: image: yourlabs/python only: [tags] - script: ./shlaxfile.py pypi + script: pypi-release stage: deploy -test: {image: 'yourlabs/shlax:$CI_COMMIT_SHORT_SHA', script: ./shlaxfile.py test, +test: {image: 'yourlabs/shlax:$CI_COMMIT_SHORT_SHA', script: ./shlaxfile.py -d test, stage: test} diff --git a/shlax/contrib/gitlab.py b/shlax/contrib/gitlab.py index 1e7ce35..000efc0 100644 --- a/shlax/contrib/gitlab.py +++ b/shlax/contrib/gitlab.py @@ -10,7 +10,6 @@ class GitLabCI(Script): for key, value in self.kwargs.items(): if isinstance(value, dict): output[key] = deepcopy(value) - output[key]['script'] = './shlaxfile.py ' + key image = output[key].get('image', 'alpine') if hasattr(image, 'image'): output[key]['image'] = image.image.repository + ':$CI_COMMIT_SHORT_SHA'