Skip to content
Snippets Groups Projects
Commit f2ebccc4 authored by Wouter Deconinck's avatar Wouter Deconinck
Browse files

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

parent 5cac6a6e
Branches
No related tags found
1 merge request!1fix: merge --no-commit --no-ff
Pipeline #53903 canceled
......@@ -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:
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment