Skip to content
Snippets Groups Projects
Commit dbf32d61 authored by Alexander König's avatar Alexander König
Browse files

some bug fixes to DEPLOYMENT guide

parent 0491e95b
No related branches found
No related tags found
No related merge requests found
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
- [ ] (Optional) You can now deploy stable to dspace-dev (`./release.sh $VERSION_NUMBER-RC-$RCNUMBER`) - [ ] (Optional) You can now deploy stable to dspace-dev (`./release.sh $VERSION_NUMBER-RC-$RCNUMBER`)
- [ ] Make sure that the stable branch is clean and all commits are pushed to origin - [ ] Make sure that the stable branch is clean and all commits are pushed to origin
- [ ] `git checkout production` - [ ] `git checkout production`
- [ ] `git checkout -b v$VERSION_NUMBER $HASHID -- .` - [ ] `git checkout -b $VERSION_NUMBER $HASHID`
The $HASHID being the commit were the last merge from stable happened (before clarindev2clarin.sh changes were committed) The $HASHID being the commit were the last merge from stable happened (before clarindev2clarin.sh changes were committed)
- [ ] `git merge --no-ff stable` - [ ] `git merge --no-ff stable`
- [ ] resolve conflicts (though there shouldn't be any) and commit - [ ] resolve conflicts (though there shouldn't be any) and commit
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
- [ ] Run the clarindev2clarin.sh script - [ ] Run the clarindev2clarin.sh script
- [ ] `git commit -a ` - [ ] `git commit -a `
- [ ] `git checkout production` - [ ] `git checkout production`
- [ ] `git merge v1.3-$VERSION_NUMBER` - [ ] `git merge $VERSION_NUMBER`
- [ ] resolve conflicts and commit - [ ] resolve conflicts and commit
- [ ] `git tag -a $VERSION_NUMBER -s (-u $GPG_ID_HASH)` defaults to your default GPG key - [ ] `git tag -a $VERSION_NUMBER -s (-u $GPG_ID_HASH)` defaults to your default GPG key
- [ ] `git branch -d $VERSION_NUMBER` - [ ] `git branch -d $VERSION_NUMBER`
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment