diff --git a/DEPLOYMENT.md b/DEPLOYMENT.md index c58e30c86b8d28f8fd2cf25a76abf155782a8a89..448338d1a619a8b1a184a111fc4971bc6cff05b1 100644 --- a/DEPLOYMENT.md +++ b/DEPLOYMENT.md @@ -10,15 +10,16 @@ - [ ] `git checkout -b v$VERSION_NUMBER $HASHID -- .` The $HASHID being the commit were the last merge from stable happened (before clarindev2clarin.sh changes were committed) - [ ] `git merge --no-ff stable` -- [ ] resolve conflicts and commit +- [ ] resolve conflicts (though there shouldn't be any) and commit - [ ] Change the version number and the registry branch of the images in all deployment yaml files - [ ] Run the clarindev2clarin.sh script - [ ] `git commit -a ` - [ ] `git checkout production` - [ ] `git merge v1.3-$VERSION_NUMBER` - [ ] resolve conflicts and commit -- [ ] `git tag -a $VERSION_NUMBER -s -u $GPG_ID_HASH` -- [ ] `git push --all +- [ ] `git tag -a $VERSION_NUMBER -s (-u $GPG_ID_HASH)` defaults to your default GPG key +- [ ] `git branch -d $VERSION_NUMBER` +- [ ] `git push --all` - [ ] `git push --tags` - [ ] `cd dockerfiles` - [ ] `./release.sh $VERSION_NUMBER production`