haveno-network/haveno-core
haveno-network/haveno-core
1
0
Fork 1
Code Issues 4 Pull requests Projects 5 Releases 1 Packages Wiki Activity Actions 2

Update .gitlab-ci.yml file

Browse source
This commit is contained in:
Kewbit 2024-11-27 22:50:15 +00:00
parent ddb08f56d0
commit 311116f4fb
1 changed files with 5 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
.gitlab-ci.yml
View file

@ -11,7 +11,6 @@ update_patched_master:
- patched_changes - patched_changes
script: script:
- apk add --no-cache git - apk add --no-cache git
- echo "Setting up Git..."
- git config user.name "$GITLAB_USER_NAME" - git config user.name "$GITLAB_USER_NAME"
- git config user.email "$GITLAB_USER_EMAIL" - git config user.email "$GITLAB_USER_EMAIL"
- git remote set-url origin http://oauth2:${GITLAB_ACCESS_TOKEN}@172.17.0.1:4411/${CI_PROJECT_PATH}.git - git remote set-url origin http://oauth2:${GITLAB_ACCESS_TOKEN}@172.17.0.1:4411/${CI_PROJECT_PATH}.git
@ -19,16 +18,11 @@ update_patched_master:
- git fetch --all - git fetch --all
- echo "Checking out patched_master..." - echo "Checking out patched_master..."
- git checkout patched_master - git checkout patched_master
- echo "Merging master into patched_master..." - echo "Merging master into patched_master, favoring patched_changes..."
- git merge origin/master --no-edit - git merge -s recursive -X theirs origin/master
- echo "Cleaning working directory..." - echo "Cleaning up after merge..."
- git rm -r --cached .
- git clean -fd
- echo "Overwriting all files from patched_changes (excluding .gitlab-ci.yml)..."
- git checkout origin/patched_changes -- . ':!.gitlab-ci.yml'
- echo "Adding changes..."
- git add . - git add .
- echo "Committing changes..." - echo "Committing resolved merge..."
- git commit -m "Auto-update patched_master with changes from patched_changes" - git commit -m "Auto-resolve merge conflicts: Favor patched_changes"
- echo "Pushing changes to patched_master..." - echo "Pushing changes to patched_master..."
- git push origin patched_master - git push origin patched_master