Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
slapos
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Lu Xu
slapos
Commits
2fddbe1e
Commit
2fddbe1e
authored
Sep 14, 2023
by
Thomas Gambier
🚴🏼
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
update-rc: remove trailing spaces and update Nexedi ERP5' URL
parent
0017e22d
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
4 deletions
+4
-4
update-rc
update-rc
+4
-4
No files found.
update-rc
View file @
2fddbe1e
...
@@ -15,17 +15,17 @@ git branch -D 1.0 || echo
...
@@ -15,17 +15,17 @@ git branch -D 1.0 || echo
git checkout origin/1.0
-b
1.0
git checkout origin/1.0
-b
1.0
# Reset and Clean
# Reset and Clean
git reset
--hard
origin/1.0
git reset
--hard
origin/1.0
git clean
-f
git clean
-f
# Merge master
# Merge master
git merge origin/master
-m
"Update Release Candidate"
git merge origin/master
-m
"Update Release Candidate"
# Revert changes from master
# 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
# 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
# Suggestion
...
@@ -33,7 +33,7 @@ echo "Review and run
...
@@ -33,7 +33,7 @@ echo "Review and run
bash update-release.sh
bash update-release.sh
git commit -m 'Update git revisions' -a
git commit -m 'Update git revisions' -a
git push origin 1.0
git push origin 1.0
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment