Update .gitlab-ci.yml file
This commit is contained in:
parent
ac9e51a73f
commit
e4e0dc3bf3
1 changed files with 5 additions and 2 deletions
|
@ -8,7 +8,7 @@ update_patched_master:
|
||||||
script:
|
script:
|
||||||
- apk --no-cache add git
|
- apk --no-cache add git
|
||||||
- echo "Setting up Git repository locally..."
|
- echo "Setting up Git repository locally..."
|
||||||
- git clone http://172.17.0.1:4411/haveno/haveno.git /tmp/repo
|
- git clone http://oauth2:${CI_JOB_TOKEN}@${CI_SERVER_HOST}/${CI_PROJECT_PATH}.git /tmp/repo
|
||||||
- cd /tmp/repo
|
- cd /tmp/repo
|
||||||
- echo "Fetching all branches..."
|
- echo "Fetching all branches..."
|
||||||
- git fetch origin
|
- git fetch origin
|
||||||
|
@ -17,6 +17,9 @@ update_patched_master:
|
||||||
echo "patched_changes branch found. Proceeding...";
|
echo "patched_changes branch found. Proceeding...";
|
||||||
git checkout patched_master || git checkout -b patched_master;
|
git checkout patched_master || git checkout -b patched_master;
|
||||||
git reset --hard origin/patched_changes;
|
git reset --hard origin/patched_changes;
|
||||||
|
else
|
||||||
|
echo "Error: patched_changes branch does not exist in the remote repository.";
|
||||||
|
exit 1;
|
||||||
fi
|
fi
|
||||||
- echo "Force-pushing patched_master to match patched_changes..."
|
- echo "Force-pushing patched_master to match patched_changes..."
|
||||||
- git push origin patched_master --force
|
- git push origin patched_master --force
|
Loading…
Reference in a new issue