diff --git a/.mergify.yml b/.mergify.yml index d0dd9f6..ccb37d6 100644 --- a/.mergify.yml +++ b/.mergify.yml @@ -11,17 +11,17 @@ queue_rules: - status-success=package-python - status-success=package-dotnet - status-success=package-go + merge_method: squash + commit_message_template: |- + {{ title }} (#{{ number }}) + + {{ body }} pull_request_rules: - name: Automatic merge on approval and successful build actions: delete_head_branch: {} queue: - method: squash name: default - commit_message_template: |- - {{ title }} (#{{ number }}) - - {{ body }} conditions: - "#approved-reviews-by>=1" - -label~=(do-not-merge) diff --git a/package.json b/package.json index 2834b55..85f14a5 100644 --- a/package.json +++ b/package.json @@ -56,7 +56,7 @@ "jsii-docgen": "^10.5.0", "jsii-pacmak": "^1.104.0", "jsii-rosetta": "1.x", - "projen": "^0.88.3", + "projen": "^0.88.4", "ts-jest": "^27", "ts-node": "^10.9.2", "typescript": "^4.9.5" diff --git a/yarn.lock b/yarn.lock index e0e12a7..3c45f23 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3821,10 +3821,10 @@ pretty-format@^27.0.0, pretty-format@^27.5.1: ansi-styles "^5.0.0" react-is "^17.0.1" -projen@^0.88.3: - version "0.88.3" - resolved "https://registry.yarnpkg.com/projen/-/projen-0.88.3.tgz#d75e1dca5cc0766f986acedc05731590648f15b8" - integrity sha512-VTH2orA3HIrgzdL89w8O2oaogUbKHaORYtM6H/v2biHwNqNJR998MV2eGq4tvynJE/VjFKNZWbf0mveg7p+36w== +projen@^0.88.4: + version "0.88.4" + resolved "https://registry.yarnpkg.com/projen/-/projen-0.88.4.tgz#4f4a02f0125c204d0d3bc5ae2f6d99f0bbb9a653" + integrity sha512-h2OW79w4opcqOhdxyabKWKBAavguQK7MJNXf/msyxpfhybsRllu2BlA6YR88lM9NBVs3k3/SfbuKHC4TB/yMHQ== dependencies: "@iarna/toml" "^2.2.5" case "^1.6.3"