diff --git a/.gitattributes b/.gitattributes index 5885da6d..1fd3a855 100644 --- a/.gitattributes +++ b/.gitattributes @@ -9,6 +9,7 @@ /.github/workflows/stale.yml linguist-generated /.github/workflows/upgrade-master.yml linguist-generated /.gitignore linguist-generated +/.mergify.yml linguist-generated /.npmignore linguist-generated /.projen/** linguist-generated /.projen/deps.json linguist-generated diff --git a/.gitignore b/.gitignore index 465d796a..2643505b 100644 --- a/.gitignore +++ b/.gitignore @@ -36,6 +36,7 @@ junit.xml !/.github/workflows/build.yml /dist/changelog.md /dist/version.txt +!/.mergify.yml !/.github/pull_request_template.md !/test/ !/tsconfig.dev.json diff --git a/.mergify.yml b/.mergify.yml new file mode 100644 index 00000000..ebf847d8 --- /dev/null +++ b/.mergify.yml @@ -0,0 +1,15 @@ +# ~~ Generated by projen. To modify, edit .projenrc.js and run "npx projen". + +pull_request_rules: + - name: Automatic merge on approval and successful build + actions: + merge: + method: squash + commit_message: title+body + strict: smart + strict_method: merge + delete_head_branch: {} + conditions: + - "#approved-reviews-by>=1" + - -label~=(do-not-merge) + - status-success=build diff --git a/.npmignore b/.npmignore index 7956cf2e..4fe3d895 100644 --- a/.npmignore +++ b/.npmignore @@ -5,6 +5,7 @@ junit.xml /coverage/ /dist/changelog.md /dist/version.txt +/.mergify.yml /test/ /tsconfig.dev.json /src/ diff --git a/.projenrc.js b/.projenrc.js index e8734849..3f40ceb9 100644 --- a/.projenrc.js +++ b/.projenrc.js @@ -33,7 +33,6 @@ const project = new AwsCdkConstructLibrary({ releaseWorkflow: true, npmAccess: NpmAccess.PUBLIC, cdkAssert: true, - mergify: false, docgen: true, eslint: true, publishToPypi: {