From 95bb89311c77cbf8738e28928f658c7f8fd8ec7b Mon Sep 17 00:00:00 2001 From: Otavio Macedo <288203+otaviomacedo@users.noreply.github.com> Date: Mon, 21 Oct 2024 13:46:32 +0100 Subject: [PATCH] chore: disable mergify (#2227) --- .gitattributes | 1 - .gitignore | 1 - .mergify.yml | 24 ------------------------ .npmignore | 1 - .projen/files.json | 1 - .projenrc.ts | 3 +++ 6 files changed, 3 insertions(+), 28 deletions(-) delete mode 100644 .mergify.yml diff --git a/.gitattributes b/.gitattributes index c656753d01..94f205a02d 100644 --- a/.gitattributes +++ b/.gitattributes @@ -19,7 +19,6 @@ /.github/workflows/upgrade-runtime-dependencies.yml linguist-generated /.github/workflows/website.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 2083b03fb0..5293693929 100644 --- a/.gitignore +++ b/.gitignore @@ -35,7 +35,6 @@ jspm_packages/ junit.xml /coverage/ !/.github/workflows/build.yml -!/.mergify.yml !/.github/workflows/upgrade-runtime-dependencies.yml !/test/ !/tsconfig.json diff --git a/.mergify.yml b/.mergify.yml deleted file mode 100644 index 0d8462bdff..0000000000 --- a/.mergify.yml +++ /dev/null @@ -1,24 +0,0 @@ -# ~~ Generated by projen. To modify, edit .projenrc.ts and run "npx projen". - -queue_rules: - - name: default - update_method: merge - conditions: - - "#approved-reviews-by>=1" - - -label~=(do-not-merge) - - status-success=build -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) - - status-success=build diff --git a/.npmignore b/.npmignore index 5003b41e1d..cd2172cb38 100644 --- a/.npmignore +++ b/.npmignore @@ -4,7 +4,6 @@ junit.xml /coverage/ permissions-backup.acl -/.mergify.yml /test/ /tsconfig.dev.json /src/ diff --git a/.projen/files.json b/.projen/files.json index 67f11bfe46..6872244fb4 100644 --- a/.projen/files.json +++ b/.projen/files.json @@ -17,7 +17,6 @@ ".github/workflows/upgrade-runtime-dependencies.yml", ".github/workflows/website.yml", ".gitignore", - ".mergify.yml", ".npmignore", ".projen/deps.json", ".projen/files.json", diff --git a/.projenrc.ts b/.projenrc.ts index 7d818620b1..2161d9e163 100644 --- a/.projenrc.ts +++ b/.projenrc.ts @@ -30,6 +30,9 @@ const project = new Cdk8sTeamTypeScriptProject({ 'projen', ], projenrcTs: true, + githubOptions: { + mergify: false, + }, }); for (let i = 0; i < 3; i++) {