From bfc98936ce7b3eb36604730666bca59667bad963 Mon Sep 17 00:00:00 2001 From: yeaji-helix <96082220+yeaji-helix@users.noreply.github.com> Date: Mon, 27 Jun 2022 16:47:26 -0700 Subject: [PATCH 1/5] upgrade cdk version (#92) --- .github/workflows/release.yml | 1 - .projen/deps.json | 4 ++-- .projenrc.js | 2 +- package.json | 4 ++-- version.json | 2 +- yarn.lock | 15 ++++++++++----- 6 files changed, 16 insertions(+), 12 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 57455fe2..38795089 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -5,7 +5,6 @@ on: push: branches: - main - - release-v2 workflow_dispatch: {} jobs: release: diff --git a/.projen/deps.json b/.projen/deps.json index 4ddf0d11..80c13a8f 100644 --- a/.projen/deps.json +++ b/.projen/deps.json @@ -25,7 +25,7 @@ }, { "name": "aws-cdk-lib", - "version": "2.25.0", + "version": "2.29.0", "type": "build" }, { @@ -109,7 +109,7 @@ }, { "name": "aws-cdk-lib", - "version": "2.25.0", + "version": "2.29.0", "type": "peer" }, { diff --git a/.projenrc.js b/.projenrc.js index 1b607981..cf6ee776 100644 --- a/.projenrc.js +++ b/.projenrc.js @@ -1,6 +1,6 @@ const { awscdk } = require('projen'); -const cdkVersion = '2.25.0'; +const cdkVersion = '2.29.0'; const project = new awscdk.AwsCdkConstructLibrary({ name: '@myhelix/cdk-watchful', diff --git a/package.json b/package.json index 503b6f50..d904f8f7 100644 --- a/package.json +++ b/package.json @@ -41,7 +41,7 @@ "@types/node": "^14", "@typescript-eslint/eslint-plugin": "^5", "@typescript-eslint/parser": "^5", - "aws-cdk-lib": "2.25.0", + "aws-cdk-lib": "2.29.0", "aws-sdk": "^2.1128.0", "constructs": "10.0.5", "eslint": "^8", @@ -62,7 +62,7 @@ "typescript": "^4.6.4" }, "peerDependencies": { - "aws-cdk-lib": "2.25.0", + "aws-cdk-lib": "2.29.0", "constructs": "^10.0.5" }, "keywords": [ diff --git a/version.json b/version.json index 4928ba53..9d7ed930 100644 --- a/version.json +++ b/version.json @@ -1,3 +1,3 @@ { - "version": "2.0.0" + "version": "2.29.0" } diff --git a/yarn.lock b/yarn.lock index c54a7865..5f07a3df 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1185,16 +1185,16 @@ available-typed-arrays@^1.0.5: resolved "https://registry.npmjs.org/available-typed-arrays/-/available-typed-arrays-1.0.5.tgz" integrity sha512-DMD0KiN46eipeziST1LPP/STfDU0sufISXmjSgvVsoU2tqxctQeASejWcfNtxYKqETM1UxQ8sp2OrSBWpHY6sw== -aws-cdk-lib@2.25.0: - version "2.25.0" - resolved "https://registry.yarnpkg.com/aws-cdk-lib/-/aws-cdk-lib-2.25.0.tgz#6014ab5b73b2a3012c8081b9afc8411dcb9832a0" - integrity sha512-rcQeQu/lTmi1tg5DwV0gBqJtF73khApfHt9n7BIHkKbUWvCB50lIL1Q1/7cHvTicfQ62UnwFoPWwB0YqQceDVQ== +aws-cdk-lib@2.29.0: + version "2.29.0" + resolved "https://registry.yarnpkg.com/aws-cdk-lib/-/aws-cdk-lib-2.29.0.tgz#6ac9fc27f3b551fe7ca941b1ef1d88c185657c1f" + integrity sha512-twoxtVTdZoLn5iDfO8vZPFa/j0VAm3o+8wnyzRVYR/BHtTyxWoWvYDxwLLlUijvBJ3KZV+wvqgnjDOTy7vD0IQ== dependencies: "@balena/dockerignore" "^1.0.2" case "1.6.3" fs-extra "^9.1.0" ignore "^5.2.0" - jsonschema "^1.4.0" + jsonschema "^1.4.1" minimatch "^3.1.2" punycode "^2.1.1" semver "^7.3.7" @@ -4061,6 +4061,11 @@ jsonschema@^1.4.0: resolved "https://registry.npmjs.org/jsonschema/-/jsonschema-1.4.0.tgz" integrity sha512-/YgW6pRMr6M7C+4o8kS+B/2myEpHCrxO4PEWnqJNBFMjn7EWXqlQ4tGwL6xTHeRplwuZmcAncdvfOad1nT2yMw== +jsonschema@^1.4.1: + version "1.4.1" + resolved "https://registry.yarnpkg.com/jsonschema/-/jsonschema-1.4.1.tgz#cc4c3f0077fb4542982973d8a083b6b34f482dab" + integrity sha512-S6cATIPVv1z0IlxdN+zUk5EPjkGCdnhN4wVSBlvoUO1tOLJootbo9CquNJmbIh4yikWHiUedhRYrNPn1arpEmQ== + keyv@^3.0.0: version "3.1.0" resolved "https://registry.npmjs.org/keyv/-/keyv-3.1.0.tgz" From d10a7793c980da7496dbdb9210734e1c0762d291 Mon Sep 17 00:00:00 2001 From: "yeaji.shin" Date: Mon, 27 Jun 2022 17:04:20 -0700 Subject: [PATCH 2/5] release if release-v2 branch --- .github/workflows/release.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 38795089..57455fe2 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -5,6 +5,7 @@ on: push: branches: - main + - release-v2 workflow_dispatch: {} jobs: release: From 49c8566a974cec903d43ad6da2d26f9e85878ad6 Mon Sep 17 00:00:00 2001 From: "yeaji.shin" Date: Mon, 27 Jun 2022 17:54:01 -0700 Subject: [PATCH 3/5] release-v2 for cdk v2 --- .gitattributes | 2 +- .github/workflows/release.yml | 5 ++--- .../{upgrade-main.yml => upgrade-release-v2.yml} | 12 ++++++------ .gitignore | 2 +- .projen/files.json | 2 +- .projen/tasks.json | 6 +++--- .projenrc.js | 2 +- package.json | 2 +- 8 files changed, 16 insertions(+), 17 deletions(-) rename .github/workflows/{upgrade-main.yml => upgrade-release-v2.yml} (90%) diff --git a/.gitattributes b/.gitattributes index 829e37b2..d582af23 100644 --- a/.gitattributes +++ b/.gitattributes @@ -7,7 +7,7 @@ /.github/workflows/build.yml linguist-generated /.github/workflows/pull-request-lint.yml linguist-generated /.github/workflows/release.yml linguist-generated -/.github/workflows/upgrade-main.yml linguist-generated +/.github/workflows/upgrade-release-v2.yml linguist-generated /.gitignore linguist-generated /.mergify.yml linguist-generated /.npmignore linguist-generated diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 57455fe2..293fcc1b 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -4,7 +4,6 @@ name: release on: push: branches: - - main - release-v2 workflow_dispatch: {} jobs: @@ -27,8 +26,8 @@ jobs: git config user.email "github-actions@github.com" - name: Install dependencies run: yarn install --check-files --frozen-lockfile - - name: release - run: npx projen release + - name: release:release-v2 + run: npx projen release:release-v2 - name: Check for new commits id: git_remote run: echo ::set-output name=latest_commit::"$(git ls-remote origin -h ${{ github.ref }} | cut -f1)" diff --git a/.github/workflows/upgrade-main.yml b/.github/workflows/upgrade-release-v2.yml similarity index 90% rename from .github/workflows/upgrade-main.yml rename to .github/workflows/upgrade-release-v2.yml index 379cd192..4844c4cf 100644 --- a/.github/workflows/upgrade-main.yml +++ b/.github/workflows/upgrade-release-v2.yml @@ -1,6 +1,6 @@ # ~~ Generated by projen. To modify, edit .projenrc.js and run "npx projen". -name: upgrade-main +name: upgrade-release-v2 on: workflow_dispatch: {} schedule: @@ -17,7 +17,7 @@ jobs: - name: Checkout uses: actions/checkout@v2 with: - ref: main + ref: release-v2 - name: Install dependencies run: yarn install --check-files --frozen-lockfile - name: Upgrade dependencies @@ -48,7 +48,7 @@ jobs: uses: actions/checkout@v2 with: token: ${{ secrets.PROJEN_GITHUB_TOKEN }} - ref: main + ref: release-v2 - name: Download patch uses: actions/download-artifact@v2 with: @@ -74,8 +74,8 @@ jobs: ------ - *Automatically created by projen via the "upgrade-main" workflow* - branch: github-actions/upgrade-main + *Automatically created by projen via the "upgrade-release-v2" workflow* + branch: github-actions/upgrade-release-v2 title: "chore(deps): upgrade dependencies" body: |- Upgrades project dependencies. See details in [workflow run]. @@ -84,7 +84,7 @@ jobs: ------ - *Automatically created by projen via the "upgrade-main" workflow* + *Automatically created by projen via the "upgrade-release-v2" workflow* author: github-actions committer: github-actions signoff: true diff --git a/.gitignore b/.gitignore index 56d0f3d8..a88dcc5e 100644 --- a/.gitignore +++ b/.gitignore @@ -39,7 +39,7 @@ junit.xml /dist/version.txt !/.github/workflows/release.yml !/.mergify.yml -!/.github/workflows/upgrade-main.yml +!/.github/workflows/upgrade-release-v2.yml !/.github/pull_request_template.md !/test/ !/tsconfig.dev.json diff --git a/.projen/files.json b/.projen/files.json index ffcd5fd1..3572999a 100644 --- a/.projen/files.json +++ b/.projen/files.json @@ -6,7 +6,7 @@ ".github/workflows/build.yml", ".github/workflows/pull-request-lint.yml", ".github/workflows/release.yml", - ".github/workflows/upgrade-main.yml", + ".github/workflows/upgrade-release-v2.yml", ".gitignore", ".mergify.yml", ".projen/deps.json", diff --git a/.projen/tasks.json b/.projen/tasks.json index 36750df1..cf2fdb2c 100644 --- a/.projen/tasks.json +++ b/.projen/tasks.json @@ -174,9 +174,9 @@ "name": "pre-compile", "description": "Prepare the project for compilation" }, - "release": { - "name": "release", - "description": "Prepare a release from \"main\" branch", + "release:release-v2": { + "name": "release:release-v2", + "description": "Prepare a release from \"release-v2\" branch", "env": { "RELEASE": "true" }, diff --git a/.projenrc.js b/.projenrc.js index cf6ee776..851ed7ab 100644 --- a/.projenrc.js +++ b/.projenrc.js @@ -5,7 +5,7 @@ const cdkVersion = '2.29.0'; const project = new awscdk.AwsCdkConstructLibrary({ name: '@myhelix/cdk-watchful', description: 'Watching your CDK apps since 2019', - defaultReleaseBranch: 'main', + defaultReleaseBranch: 'release-v2', authorName: 'Elad Ben-Israel (maintained by myhelix)', authorEmail: 'ops@helix.com', diff --git a/package.json b/package.json index d904f8f7..7f1f4ec4 100644 --- a/package.json +++ b/package.json @@ -21,7 +21,7 @@ "post-compile": "npx projen post-compile", "post-upgrade": "npx projen post-upgrade", "pre-compile": "npx projen pre-compile", - "release": "npx projen release", + "release:release-v2": "npx projen release:release-v2", "test": "npx projen test", "test:update": "npx projen test:update", "test:watch": "npx projen test:watch", From 1866c316029b956741f97664a4768a2afdfb6183 Mon Sep 17 00:00:00 2001 From: "yeaji.shin" Date: Tue, 28 Jun 2022 16:37:10 -0700 Subject: [PATCH 4/5] update major version is 2 --- .projen/tasks.json | 3 ++- .projenrc.js | 3 +-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.projen/tasks.json b/.projen/tasks.json index cf2fdb2c..a8299a2f 100644 --- a/.projen/tasks.json +++ b/.projen/tasks.json @@ -178,7 +178,8 @@ "name": "release:release-v2", "description": "Prepare a release from \"release-v2\" branch", "env": { - "RELEASE": "true" + "RELEASE": "true", + "MAJOR": "2" }, "steps": [ { diff --git a/.projenrc.js b/.projenrc.js index 851ed7ab..38d0b9f7 100644 --- a/.projenrc.js +++ b/.projenrc.js @@ -6,7 +6,7 @@ const project = new awscdk.AwsCdkConstructLibrary({ name: '@myhelix/cdk-watchful', description: 'Watching your CDK apps since 2019', defaultReleaseBranch: 'release-v2', - + majorVersion: 2, authorName: 'Elad Ben-Israel (maintained by myhelix)', authorEmail: 'ops@helix.com', repository: 'https://github.com/myhelix/cdk-watchful.git', @@ -17,7 +17,6 @@ const project = new awscdk.AwsCdkConstructLibrary({ cdkVersion, cdkVersionPinning: true, - devDeps: ['aws-sdk', '@aws-cdk/assert'], }); From 25113d257cddcd43410814761e768b2a1aea8944 Mon Sep 17 00:00:00 2001 From: "yeaji.shin" Date: Tue, 28 Jun 2022 17:08:43 -0700 Subject: [PATCH 5/5] update version same as cdkVersion for cdk-watchful --- .projenrc.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.projenrc.js b/.projenrc.js index 38d0b9f7..3edfcba5 100644 --- a/.projenrc.js +++ b/.projenrc.js @@ -6,7 +6,6 @@ const project = new awscdk.AwsCdkConstructLibrary({ name: '@myhelix/cdk-watchful', description: 'Watching your CDK apps since 2019', defaultReleaseBranch: 'release-v2', - majorVersion: 2, authorName: 'Elad Ben-Israel (maintained by myhelix)', authorEmail: 'ops@helix.com', repository: 'https://github.com/myhelix/cdk-watchful.git', @@ -20,6 +19,9 @@ const project = new awscdk.AwsCdkConstructLibrary({ devDeps: ['aws-sdk', '@aws-cdk/assert'], }); +// use same version with cdkVersion +project.package.addVersion(cdkVersion); + project.gitignore.exclude('.env', '.idea'); project.gitignore.exclude('example/*.js', 'example/*.d.ts');