diff --git a/.mergify.yml b/.mergify.yml index 9bda1ccdfb..4613a14bdf 100644 --- a/.mergify.yml +++ b/.mergify.yml @@ -12,17 +12,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 69f5470490..cad3a26bc7 100644 --- a/package.json +++ b/package.json @@ -61,7 +61,7 @@ "jsii-pacmak": "^1.104.0", "jsii-rosetta": "1.x", "prettier": "^2.8.8", - "projen": "^0.88.3", + "projen": "^0.88.5", "ts-jest": "^27", "typescript": "^4.9.5" }, diff --git a/yarn.lock b/yarn.lock index c6bf8ff38a..527f4919fa 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1970,9 +1970,9 @@ downlevel-dts@^0.11.0: typescript next electron-to-chromium@^1.5.28: - version "1.5.40" - resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.5.40.tgz#5f6aec13751123c5c3185999ebe3e7bcaf828c2b" - integrity sha512-LYm78o6if4zTasnYclgQzxEcgMoIcybWOhkATWepN95uwVVWV0/IW10v+2sIeHE+bIYWipLneTftVyQm45UY7g== + version "1.5.41" + resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.5.41.tgz#eae1ba6c49a1a61d84cf8263351d3513b2bcc534" + integrity sha512-dfdv/2xNjX0P8Vzme4cfzHqnPm5xsZXwsolTYr0eyW18IUmNyG08vL+fttvinTfhKfIKdRoqkDIC9e9iWQCNYQ== emittery@^0.8.1: version "0.8.1" @@ -4477,10 +4477,10 @@ process-nextick-args@~2.0.0: resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-2.0.1.tgz#7820d9b16120cc55ca9ae7792680ae7dba6d7fe2" integrity sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag== -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.5: + version "0.88.5" + resolved "https://registry.yarnpkg.com/projen/-/projen-0.88.5.tgz#93319093f41121de3a5ef2fe9f92ce80275d0bdc" + integrity sha512-eZdMr/gJBDQp5Dn7Tg4OwcGHT9xUU30BvPIgYDWlxJl3PG9fCizdxHc1d7XHEeQRjBujMm+qRVQ1Yqid8Ux6OA== dependencies: "@iarna/toml" "^2.2.5" case "^1.6.3"