diff --git a/CHANGELOG.md b/CHANGELOG.md index dfdfaadac8b42024ad2d11fa2923c925d8b7350c..e9ae4e12eaeb0519db85a77c4dac4bedcbfc5598 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -12,6 +12,15 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Removed ### Fixed +## [1.3.1] - 2019-02-25 + +### Fixed + +- oai sample identifier is now pointing to an existing record +- fixed typo to make content negotiation work for application/x-cmdi+xml +- fixed get URL for xerces +- IdP metadata from CLARIN are now downloaded during Docker build and not only once the container is running + ## [1.3] - 2018-09-05 ### Added @@ -79,8 +88,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 This is the first release. It all starts here. -[Unreleased]:https://gitlab.inf.unibz.it/commul/docker/clarin-dspace/compare/v1.1...HEAD -[1.1]: https://gitlab.inf.unibz.it/commul/docker/clarin-dspace/compare/v1.0...v1.1 -[1.2]: https://gitlab.inf.unibz.it/commul/docker/clarin-dspace/compare/v1.1...v1.2 +[Unreleased]:https://gitlab.inf.unibz.it/commul/docker/clarin-dspace/compare/v1.3.1...HEAD +[1.3.1]: https://gitlab.inf.unibz.it/commul/docker/clarin-dspace/compare/v1.3...v1.3.1 +[1.3]: https://gitlab.inf.unibz.it/commul/docker/clarin-dspace/compare/v1.2.2...v1.3 [1.2.2]: https://gitlab.inf.unibz.it/commul/docker/clarin-dspace/compare/v1.2...v1.2.2 -[1.3]: https://gitlab.inf.unibz.it/commul/docker/clarin-dspace/compare/29d6badea797498736aef4322acf3d566be7461f...4c32c4fad44cc99ef0db6544f29a8562afd97950 +[1.2]: https://gitlab.inf.unibz.it/commul/docker/clarin-dspace/compare/v1.1...v1.2 +[1.1]: https://gitlab.inf.unibz.it/commul/docker/clarin-dspace/compare/v1.0...v1.1 diff --git a/DEPLOYMENT.md b/DEPLOYMENT.md index 57d75703bd69fde1a824122c2c417fee657d7617..4c27d08b583b8eb424e7e68f1f1ec698caab83c8 100644 --- a/DEPLOYMENT.md +++ b/DEPLOYMENT.md @@ -1,21 +1,28 @@ # Step by Step deployment guide -- [ ] Make sure that the master branch is clean and all commits are pushed to origin +- [ ] Edit CHANGELOG.md and add a new section for the upcoming release +- [ ] Commit to master to make sure that the master branch is clean and all commits are pushed to origin - [ ] `git checkout stable` - [ ] `git merge --no-ff master` +- [ ] (Optional) You can now deploy stable to kommul-dev (`./release.sh $VERSION_NUMBER-RC-$RCNUMBER`) - [ ] Make sure that the stable branch is clean and all commits are pushed to origin - [ ] `git checkout production` - [ ] `git checkout $HASHID -- .` The $HASHID being the commit were the last merge from stable happened (before clarindev2clarin.sh changes were committed) +- [ ] `git checkout -b v1.3-$VERSION_NUMBER` - [ ] `git merge --no-ff stable` +- [ ] resolve conflicts and commit - [ ] Change the version number and the registry branch of the images in all deployment yaml files -- [ ] `git add kubernetes/*deploy*yaml` -- [ ] `git commit` +- [ ] 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 push --tags` - [ ] `cd dockerfiles` -- [ ] `./release $VERSION_NUMBER production` +- [ ] `./release.sh $VERSION_NUMBER production` - [ ] `cd ../kubernetes` - [ ] `./stop_kube.sh` - [ ] `./start_kube.sh`