From 41863ff82c4dbda339fb44f59a6f802f78631f53 Mon Sep 17 00:00:00 2001 From: Alexander Melnyk Date: Tue, 14 Jun 2022 16:52:07 +0200 Subject: [PATCH 1/3] mergify true to keep stuff --- .projenrc.js | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/.projenrc.js b/.projenrc.js index bad890c..581b260 100644 --- a/.projenrc.js +++ b/.projenrc.js @@ -21,14 +21,15 @@ const project = new awscdk.AwsCdkConstructLibrary({ // }, // }, github: false, + mergify: true, publishToPypi: { distName: 'cdk-lambda-powertools-python-layer', module: 'cdk_lambda_powertools_python_layer', }, - autoApproveOptions: { - secret: 'AUTOMATION_TOKEN', - allowedUsernames: ['am29d'], - }, + // autoApproveOptions: { + // secret: 'AUTOMATION_TOKEN', + // allowedUsernames: ['am29d'], + // }, license: 'MIT-0', copyrightOwner: 'Amazon.com, Inc. or its affiliates. All Rights Reserved.', }); From 29419aaf5a19ee00e1dcec4ae28014a27a331baf Mon Sep 17 00:00:00 2001 From: Alexander Melnyk Date: Tue, 14 Jun 2022 16:57:51 +0200 Subject: [PATCH 2/3] revert --- .projenrc.js | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/.projenrc.js b/.projenrc.js index 581b260..dce6185 100644 --- a/.projenrc.js +++ b/.projenrc.js @@ -13,23 +13,11 @@ const project = new awscdk.AwsCdkConstructLibrary({ devDeps: [ '@types/prettier@2.6.0', // pin until breaking changes is resolved: https://github.com/DefinitelyTyped/DefinitelyTyped/discussions/60310 ], - // depsUpgradeOptions: { - // ignoreProjen: false, - // workflowOptions: { - // labels: ['auto-approve', 'auto-merge'], - // secret: 'PROJEN_GITHUB_TOKEN', - // }, - // }, github: false, - mergify: true, publishToPypi: { distName: 'cdk-lambda-powertools-python-layer', module: 'cdk_lambda_powertools_python_layer', }, - // autoApproveOptions: { - // secret: 'AUTOMATION_TOKEN', - // allowedUsernames: ['am29d'], - // }, license: 'MIT-0', copyrightOwner: 'Amazon.com, Inc. or its affiliates. All Rights Reserved.', }); From ed59bd129d66e4b88251b6efbdea1ba3d485b52c Mon Sep 17 00:00:00 2001 From: Alexander Melnyk Date: Tue, 14 Jun 2022 17:21:57 +0200 Subject: [PATCH 3/3] fix: recreate workflows and keep it --- .gitattributes | 8 -------- .gitignore | 8 -------- .npmignore | 1 - .projen/files.json | 8 -------- 4 files changed, 25 deletions(-) diff --git a/.gitattributes b/.gitattributes index ed4cff5..fb0de1f 100644 --- a/.gitattributes +++ b/.gitattributes @@ -3,15 +3,7 @@ *.snap linguist-generated /.eslintrc.json linguist-generated /.gitattributes linguist-generated -/.github/pull_request_template.md linguist-generated -/.github/workflows/auto-approve.yml linguist-generated -/.github/workflows/build.yml linguist-generated -/.github/workflows/pull-request-lint.yml linguist-generated -/.github/workflows/release.yml linguist-generated -/.github/workflows/stale.yml linguist-generated -/.github/workflows/upgrade-main.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 0a42d2e..cf49900 100644 --- a/.gitignore +++ b/.gitignore @@ -3,9 +3,6 @@ !/.projen/tasks.json !/.projen/deps.json !/.projen/files.json -!/.github/workflows/pull-request-lint.yml -!/.github/workflows/auto-approve.yml -!/.github/workflows/stale.yml !/package.json !/LICENSE !/.npmignore @@ -36,12 +33,8 @@ jspm_packages/ /test-reports/ junit.xml /coverage/ -!/.github/workflows/build.yml /dist/changelog.md /dist/version.txt -!/.github/workflows/release.yml -!/.mergify.yml -!/.github/pull_request_template.md !/test/ !/tsconfig.dev.json !/src/ @@ -51,4 +44,3 @@ junit.xml .jsii tsconfig.json !/API.md -!/.github/workflows/upgrade-main.yml diff --git a/.npmignore b/.npmignore index efe7d67..b0a0a9e 100644 --- a/.npmignore +++ b/.npmignore @@ -5,7 +5,6 @@ junit.xml /coverage/ /dist/changelog.md /dist/version.txt -/.mergify.yml /test/ /tsconfig.dev.json /src/ diff --git a/.projen/files.json b/.projen/files.json index 0e6ca93..8178609 100644 --- a/.projen/files.json +++ b/.projen/files.json @@ -2,15 +2,7 @@ "files": [ ".eslintrc.json", ".gitattributes", - ".github/pull_request_template.md", - ".github/workflows/auto-approve.yml", - ".github/workflows/build.yml", - ".github/workflows/pull-request-lint.yml", - ".github/workflows/release.yml", - ".github/workflows/stale.yml", - ".github/workflows/upgrade-main.yml", ".gitignore", - ".mergify.yml", ".projen/deps.json", ".projen/files.json", ".projen/tasks.json",