From e00e55df6e062bdbc75565cfe8e9153675b31f14 Mon Sep 17 00:00:00 2001
From: Chris Pastl <chris@crispybits.app>
Date: Fri, 15 Mar 2024 13:39:50 +0100
Subject: [PATCH] refactor: group install_requirements, rename release_rules
---
.gitlab-ci.yml | 20 ++++++++++----------
1 file changed, 10 insertions(+), 10 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index be740fc8..5992b485 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,11 +1,3 @@
-.release-rules: &release-rules
- # rule to run job on a tag-reference which has the form number.number.number (semantic versioning)
- # or number.number.number-text (semantic versioning + release-name)
- # and where a Dockerfile exists
- - if: $CI_COMMIT_TAG =~ /^\d+[.]\d+[.]\d+$/ || $CI_COMMIT_TAG =~ /^\d+[.]\d+[.]\d+[-]\S+$/
- exists:
- - Dockerfile
-
stages:
- build
- test
@@ -19,6 +11,14 @@ stages:
- pip install poetry
- poetry install --no-interaction
+.release_rules: &release_rules
+ # rule to run job on a tag-reference which has the form number.number.number (semantic versioning)
+ # or number.number.number-text (semantic versioning + release-name)
+ # and where a Dockerfile exists
+ - if: $CI_COMMIT_TAG =~ /^\d+[.]\d+[.]\d+$/ || $CI_COMMIT_TAG =~ /^\d+[.]\d+[.]\d+[-]\S+$/
+ exists:
+ - Dockerfile
+
build-openapi-scheme:
stage: build
image: python:3.11-slim
@@ -113,7 +113,7 @@ docker-push:
docker push $AURA_IMAGE_NAME:$CI_COMMIT_TAG
fi
rules:
- - *release-rules
+ - *release_rules
# every commit on master/main or feature branch should trigger a push
- if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH || $CI_MERGE_REQUEST_SOURCE_BRANCH_NAME =~ /^feat/
exists:
@@ -124,7 +124,7 @@ release_job:
needs:
- docker-push
image: registry.gitlab.com/gitlab-org/release-cli:latest
- rules: *release-rules
+ rules: *release_rules
script:
- echo "this will be a release when there is a tag, but tags should be protected to be only createable by maintainers."
release:
--
GitLab