Commit 2fddbe1e authored by Thomas Gambier's avatar Thomas Gambier 🚴🏼

update-rc: remove trailing spaces and update Nexedi ERP5' URL

parent 0017e22d
......@@ -15,17 +15,17 @@ git branch -D 1.0 || echo
git checkout origin/1.0 -b 1.0
# Reset and Clean
git reset --hard origin/1.0
git reset --hard origin/1.0
git clean -f
# Merge master
git merge origin/master -m "Update Release Candidate"
# Revert changes from master
git diff HEAD..origin/master | git apply
git diff HEAD..origin/master | git apply
# Download patch to update revisions based on tests
wget -O update-release.sh https://nexedi.erp5.net/portal_skins/custom/TestResultModule_getReleaseCandidateRevision
wget -O update-release.sh https://erp5.nexedi.net/portal_skins/custom/TestResultModule_getReleaseCandidateRevision
# Suggestion
......@@ -33,7 +33,7 @@ echo "Review and run
bash update-release.sh
git commit -m 'Update git revisions' -a
git commit -m 'Update git revisions' -a
git push origin 1.0
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment