From d7ec4e0d36e7188b6431eb21d2b78b49f38704a2 Mon Sep 17 00:00:00 2001 From: Sebastian Korfmann Date: Thu, 12 Aug 2021 16:09:22 +0200 Subject: [PATCH 1/3] No mergify --- .gitattributes | 1 - .gitignore | 1 - .mergify.yml | 15 --------------- .npmignore | 1 - .projenrc.js | 1 + 5 files changed, 1 insertion(+), 18 deletions(-) delete mode 100644 .mergify.yml diff --git a/.gitattributes b/.gitattributes index 4d9895e4..d360a30a 100644 --- a/.gitattributes +++ b/.gitattributes @@ -9,7 +9,6 @@ /.github/workflows/stale.yml linguist-generated /.github/workflows/upgrade-dependencies.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 fed3a2a8..6697e4b6 100644 --- a/.gitignore +++ b/.gitignore @@ -38,7 +38,6 @@ yarn-error.log* !/.github/workflows/release.yml !/.github/workflows/stale.yml !/.github/workflows/upgrade-dependencies.yml -!/.mergify.yml !/.npmignore !/.projen/deps.json !/.projen/tasks.json diff --git a/.mergify.yml b/.mergify.yml deleted file mode 100644 index ebf847d8..00000000 --- a/.mergify.yml +++ /dev/null @@ -1,15 +0,0 @@ -# ~~ 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 471eeaad..64614f30 100644 --- a/.npmignore +++ b/.npmignore @@ -2,7 +2,6 @@ /.eslintrc.json /.github /.idea -/.mergify.yml /.projen /.projenrc.js /.vscode diff --git a/.projenrc.js b/.projenrc.js index 6fa306a1..c17830f5 100644 --- a/.projenrc.js +++ b/.projenrc.js @@ -20,6 +20,7 @@ const project = new JsiiProject({ releaseToNpm: true, minNodeVersion: '12.19.0', compileBeforeTest: true, + mergify: false, scripts: { 'eslint:fix': 'eslint . --ext .ts --fix', }, From a247ec77ede281aeaaf1f8080e61939ca6f0f323 Mon Sep 17 00:00:00 2001 From: Sebastian Korfmann Date: Thu, 12 Aug 2021 16:10:10 +0200 Subject: [PATCH 2/3] No mergify in deps as well --- src/index.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/src/index.ts b/src/index.ts index 9aa94c50..80308054 100644 --- a/src/index.ts +++ b/src/index.ts @@ -45,6 +45,7 @@ export class CdktfProviderProject extends JsiiProject { authorOrganization: true, defaultReleaseBranch: 'main', repository: `https://github.com/${githubNamespace}/cdktf-provider-${providerName}.git`, + mergify: false, python: { distName: `${namespace}-cdktf-provider-${providerName}`, module: `${namespace}_cdktf_provider_${providerName}`, From 2b63fe9f7f990225690145c5d6e9fd53d37d6668 Mon Sep 17 00:00:00 2001 From: Sebastian Korfmann Date: Thu, 12 Aug 2021 16:10:29 +0200 Subject: [PATCH 3/3] No eslint in deps --- src/index.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/src/index.ts b/src/index.ts index 80308054..1b374203 100644 --- a/src/index.ts +++ b/src/index.ts @@ -46,6 +46,7 @@ export class CdktfProviderProject extends JsiiProject { defaultReleaseBranch: 'main', repository: `https://github.com/${githubNamespace}/cdktf-provider-${providerName}.git`, mergify: false, + eslint: false, python: { distName: `${namespace}-cdktf-provider-${providerName}`, module: `${namespace}_cdktf_provider_${providerName}`,