diff --git a/.circleci/config.yml b/.circleci/config.yml index 76a5b77..43c44c1 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -46,7 +46,7 @@ jobs: command: source <(curl -s https://raw.githubusercontent.com/boxheed/shippable-scripts/master/java-build-ci-setup) - checkout - run: ./gradlew tagSemver - - run: git checkout develop && git merge $CIRCLE_BRANCH + - run: "git checkout develop && git merge $CIRCLE_BRANCH -m \"fix(release): merge $CIRCLE_BRANCH into develop\" --no-ff" - run: git push --atomic origin $CIRCLE_BRANCH develop --tags publish: diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 1afe042..9881f5b 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -10,3 +10,5 @@ updates: schedule: interval: "weekly" target-branch: "develop" + commit-message: + prefix: "fix(deps)" \ No newline at end of file