Skip to content
Snippets Groups Projects
Commit 020038cb authored by Benoit Lavenier's avatar Benoit Lavenier
Browse files

fix(CI): try to debug merge error

parent e30ebd53
No related branches found
No related tags found
No related merge requests found
Pipeline #35376 failed
Stage: environment
Stage: build
Stage: alt_build
Stage: release
Show whitespace changes
Inline Side-by-side
Showing
with 1 addition and 4 deletions
.gitlab-ci.yml
+ 1
− 4
View file @ 020038cb
...@@ -177,10 +177,7 @@ failsafe-build: ...@@ -177,10 +177,7 @@ failsafe-build:
- git add package.json src/manifest.json android/app/build.gradle install.sh - git add package.json src/manifest.json android/app/build.gradle install.sh
- git commit -m "Prepare release ${RELEASE_VERSION}" --no-verify - git commit -m "Prepare release ${RELEASE_VERSION}" --no-verify
- git checkout master - git checkout master
- git status - git reset --hard origin/master
- 'git log -3 | tail -100'
- git remote get-url origin
#- git reset --hard origin/master
- git merge --no-ff --no-edit -m "Release ${RELEASE_VERSION}" "release/${RELEASE_VERSION}" - git merge --no-ff --no-edit -m "Release ${RELEASE_VERSION}" "release/${RELEASE_VERSION}"
- git tag -a "${RELEASE_VERSION}" -m "${RELEASE_VERSION}" - git tag -a "${RELEASE_VERSION}" -m "${RELEASE_VERSION}"
- git checkout develop - git checkout develop
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment