From f2ebccc4eeb9da51805494a83f08dc8eb4d2a1a7 Mon Sep 17 00:00:00 2001
From: Wouter Deconinck <wdconinc@gmail.com>
Date: Wed, 22 Mar 2023 18:21:56 +0000
Subject: [PATCH] fix: merge --no-commit --no-ff
---
.gitlab-ci-init.yml | 16 ++++++++++++----
1 file changed, 12 insertions(+), 4 deletions(-)
diff --git a/.gitlab-ci-init.yml b/.gitlab-ci-init.yml
index 8ac6c21..3086b1d 100644
--- a/.gitlab-ci-init.yml
+++ b/.gitlab-ci-init.yml
@@ -25,7 +25,7 @@ stages:
}' ;
fi
-pending:
+status:pending:
stage: pending
extends: .status
variables:
@@ -38,11 +38,19 @@ prepare:
script:
- git remote add github ${GITHUB_REPOSITORY}
- git fetch github ${GITHUB_REF}
- - git merge --allow-unrelated-histories github/${GITHUB_REF}
+ - git merge --allow-unrelated-histories --no-commit --no-ff github/${GITHUB_REF}
artifacts:
paths:
- .
+status:running:
+ stage: running
+ extends: .status
+ variables:
+ STATE: "running"
+ DESCRIPTION: "Running..."
+ when: always
+
running:
stage: running
trigger:
@@ -54,7 +62,7 @@ running:
- artifacts: True
job: prepare
-report:success:
+status:success:
stage: report
extends: .status
variables:
@@ -62,7 +70,7 @@ report:success:
DESCRIPTION: "Succeeded!"
when: on_success
-report:failure:
+status:failure:
stage: report
extends: .status
variables:
--
GitLab