From 7e864c2bc61a4ea2f3f0b9db2947a9b014d2364b Mon Sep 17 00:00:00 2001
From: Griefed <griefed@griefed.de>
Date: Sat, 29 Jan 2022 10:02:16 +0100
Subject: [PATCH] ci: Move services, image and variables to global
---
.gitlab-ci.yml | 42 ++++++++++++++----------------------------
1 file changed, 14 insertions(+), 28 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index f9b2935..800686b 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -3,18 +3,21 @@ stages:
- release
- build
+services:
+ - name: griefed/gitlab-ci-cd:2.0.0
+ alias: docker
+ command: ["--experimental"]
+
+image: griefed/gitlab-ci-cd:2.0.0
+
+variables:
+ project_name: $CI_PROJECT_NAME
+ SEMANTIC_RELEASE_PACKAGE: $CI_PROJECT_NAME
+ FOCAL_RELEASE_DATE: "current"
+ OVERLAY_VERSION: "v2.2.0.3"
+
test docker:
- image: griefed/gitlab-ci-cd:2.0.0
stage: test
- services:
- - name: griefed/gitlab-ci-cd:2.0.0
- alias: docker
- command: ["--experimental"]
- variables:
- project_name: $CI_PROJECT_NAME
- SEMANTIC_RELEASE_PACKAGE: $CI_PROJECT_NAME
- FOCAL_RELEASE_DATE: "current"
- OVERLAY_VERSION: "v2.2.0.3"
before_script:
- docker login -u "$DOCKERHUB_USER" -p "$DOCKERHUB_TOKEN" docker.io
- docker login -u "$DOCKERHUB_USER" -p "$GITHUB_TOKEN" ghcr.io
@@ -74,13 +77,6 @@ test docker:
release:
needs: ['test docker']
stage: release
- image: griefed/gitlab-ci-cd:2.0.0
- services:
- - name: griefed/gitlab-ci-cd:2.0.0
- alias: docker
- variables:
- project_name: $CI_PROJECT_NAME
- SEMANTIC_RELEASE_PACKAGE: $CI_PROJECT_NAME
script:
- npx semantic-release
only:
@@ -92,17 +88,7 @@ release:
- '$CI_COMMIT_TITLE =~ /^RELEASE:.+$/ || $CI_PIPELINE_SOURCE == "schedule"'
build:
- image: griefed/gitlab-ci-cd:2.0.0
stage: build
- services:
- - name: griefed/gitlab-ci-cd:2.0.0
- alias: docker
- command: ["--experimental"]
- variables:
- project_name: $CI_PROJECT_NAME
- SEMANTIC_RELEASE_PACKAGE: $CI_PROJECT_NAME
- FOCAL_RELEASE_DATE: "current"
- OVERLAY_VERSION: "v2.2.0.3"
before_script:
- docker login -u "$DOCKERHUB_USER" -p "$DOCKERHUB_TOKEN" docker.io
- docker login -u "$DOCKERHUB_USER" -p "$GITHUB_TOKEN" ghcr.io
@@ -250,4 +236,4 @@ Check Packages:on-schedule:
docker image rm -f $DOCKERHUB_USER/$DOCKERHUB_REPO:latest
docker image rm -f localbuild
rm -rf /tmp/$CI_PROJECT_PATH
- echo "Done."
\ No newline at end of file
+ echo "Done."
--
GitLab