diff options
| -rw-r--r-- | Makefile | 6 | ||||
| -rw-r--r-- | composer.lock | 2 |
2 files changed, 5 insertions, 3 deletions
@@ -44,11 +44,13 @@ mocktag: tag_and_push: - @if [[ "$(CURRENT_BRANCH)" != "master" ]]; then \ + @git commit -a -m "Creating Tag v$(v) at $(DATENOW) - $(m)" ;\ + + if [[ "$(CURRENT_BRANCH)" != "master" ]]; then \ git checkout master ;\ git merge $(CURRENT_BRANCH) ;\ fi - @git commit -a -m "Creating Tag v$(v) at $(DATENOW) - $(m)" ;\ + git tag v$(v) ;\ git push ;\ git push --tags ;\ diff --git a/composer.lock b/composer.lock index 51c9eb10..6713acb4 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "41e2cfa00337e7ec07dd0fedac8f73a5", + "content-hash": "7ff87959186049ed6908eddc61e9bad0", "packages": [ { "name": "adodb/adodb-php", |