From 0f2b7ae46e22255ddda29827b3edbdce895bf4a0 Mon Sep 17 00:00:00 2001
From: jurgenhaas <juergen.haas@lakedrops.com>
Date: Tue, 20 Feb 2024 10:00:30 +0100
Subject: [PATCH] gitlab-ci-cd/general#16 Create new mixin to merge a branch,
use that in various places and ensure composer packages to always merge in
the release stage
---
mixins.yml | 18 ++++++++++++++++++
1 file changed, 18 insertions(+)
diff --git a/mixins.yml b/mixins.yml
index 96741e7..d02931b 100644
--- a/mixins.yml
+++ b/mixins.yml
@@ -45,3 +45,21 @@ stages:
.customreferences:
LanguageFiles: []
+
+.merge:
+ stage: release
+ tags:
+ - default
+ variables:
+ GIT_STRATEGY: none
+ image: registry.lakedrops.com/docker/gitlab-drupal-ci/php-8.2
+ cache: {}
+ before_script: !reference [.prepareaccess, before_script]
+ script:
+ - rm -rf /tmp/release || true
+ - mkdir -p /tmp/release
+ - cd /tmp/release
+ - git clone -b $SOURCE_BRANCH git@${CI_SERVER_HOST}:$CI_PROJECT_PATH.git .
+ - merge
+ - cd -
+ - rm -rf /tmp/release || true
--
GitLab