Makefile in uffizzi-cli-0.3.3 vs Makefile in uffizzi-cli-0.3.4
- old
+ new
@@ -16,14 +16,16 @@
release_major:
make release
release:
git checkout develop
+ git pull origin --rebase develop
@echo 'Set a new version'
docker-compose run --rm gem bash -c "bundle exec bump set ${VERSION}"
@echo 'Update remote origin'
git push origin develop
git checkout main
+ git pull origin --rebase main
git merge --no-ff --no-edit develop
git push origin main
@echo 'Create a new tag'
git tag v${VERSION}
git push origin v${VERSION}