Skip to content
Snippets Groups Projects

fix: merge --no-commit --no-ff

Merged Wouter Deconinck requested to merge wdconinc-main-patch-07733 into main
1 file
+ 12
4
Compare changes
  • Side-by-side
  • Inline
+ 12
4
@@ -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:
Loading