diff --git a/.github/workflows/auto-approve.yml b/.github/workflows/auto-approve.yml index 698d7192..b12de6e9 100644 --- a/.github/workflows/auto-approve.yml +++ b/.github/workflows/auto-approve.yml @@ -8,6 +8,7 @@ on: - labeled - ready_for_review - reopened +concurrency: ${{ github.workflow }}-${{ github.ref }} jobs: approve: runs-on: ubuntu-latest diff --git a/.projen/deps.json b/.projen/deps.json index 8f99f1f0..5d0e4616 100644 --- a/.projen/deps.json +++ b/.projen/deps.json @@ -107,6 +107,7 @@ }, { "name": "typescript", + "version": "~5.2.0", "type": "build" }, { diff --git a/.projen/tasks.json b/.projen/tasks.json index 074d8323..db22acd3 100644 --- a/.projen/tasks.json +++ b/.projen/tasks.json @@ -270,13 +270,13 @@ }, "steps": [ { - "exec": "npx npm-check-updates@16 --upgrade --target=minor --peer --dep=dev,peer,prod,optional --filter=@types/fs-extra,@types/jest,@types/node,@typescript-eslint/eslint-plugin,@typescript-eslint/parser,constructs,eslint-config-prettier,eslint-import-resolver-typescript,eslint-plugin-import,eslint-plugin-prettier,eslint,glob,jest,jest-junit,jsii-diff,jsii-docgen,jsii-pacmak,prettier,projen,standard-version,ts-jest,ts-node,typescript,change-case,fs-extra" + "exec": "npx npm-check-updates@16 --upgrade --target=minor --peer --dep=dev,peer,prod,optional --filter=@types/fs-extra,@types/jest,@types/node,@typescript-eslint/eslint-plugin,@typescript-eslint/parser,constructs,eslint-config-prettier,eslint-import-resolver-typescript,eslint-plugin-import,eslint-plugin-prettier,eslint,glob,jest,jest-junit,jsii-diff,jsii-docgen,jsii-pacmak,prettier,projen,standard-version,ts-jest,ts-node,change-case,fs-extra" }, { "exec": "yarn install --check-files" }, { - "exec": "yarn upgrade @types/fs-extra @types/jest @types/node @typescript-eslint/eslint-plugin @typescript-eslint/parser constructs eslint-config-prettier eslint-import-resolver-typescript eslint-plugin-import eslint-plugin-prettier eslint glob jest jest-junit jsii-diff jsii-docgen jsii-pacmak prettier projen standard-version ts-jest ts-node typescript change-case fs-extra" + "exec": "yarn upgrade @types/fs-extra @types/jest @types/node @typescript-eslint/eslint-plugin @typescript-eslint/parser constructs eslint-config-prettier eslint-import-resolver-typescript eslint-plugin-import eslint-plugin-prettier eslint glob jest jest-junit jsii-diff jsii-docgen jsii-pacmak prettier projen standard-version ts-jest ts-node change-case fs-extra" }, { "exec": "npx projen" diff --git a/.projenrc.ts b/.projenrc.ts index 93e77bc1..3ba8bbf4 100644 --- a/.projenrc.ts +++ b/.projenrc.ts @@ -32,6 +32,7 @@ const project = new cdk.JsiiProject({ licensed: false, // we do supply our own license file with a custom header pullRequestTemplate: false, jsiiVersion: "~5.2.0", + typescriptVersion: "~5.2.0", // should always be the same major/minor as JSII peerDeps: ["projen@^0.77.2", "constructs@^10.3.0"], deps: ["change-case", "fs-extra"], devDeps: ["@types/fs-extra", "glob"], diff --git a/src/auto-approve.ts b/src/auto-approve.ts index f929a9a8..40054615 100644 --- a/src/auto-approve.ts +++ b/src/auto-approve.ts @@ -21,6 +21,8 @@ export class AutoApprove { }, }); + (workflow.concurrency as any) = "${{ github.workflow }}-${{ github.ref }}"; + const maintainerStatuses = `fromJSON('["OWNER", "MEMBER", "COLLABORATOR"]')`; workflow.addJobs({ approve: { diff --git a/src/force-release.ts b/src/force-release.ts index d16274d7..39013a5b 100644 --- a/src/force-release.ts +++ b/src/force-release.ts @@ -62,7 +62,9 @@ export class ForceRelease { { name: "Setup Node.js", uses: "actions/setup-node", - with: { "node-version": "16.14.0" }, + with: { + "node-version": project.minNodeVersion, + }, }, { name: "Install dependencies", @@ -96,7 +98,9 @@ export class ForceRelease { { name: "Setup Node.js", uses: "actions/setup-node", - with: { "node-version": "16.14.0" }, + with: { + "node-version": project.minNodeVersion, + }, }, { name: "Setup Go", diff --git a/test/__snapshots__/index.test.ts.snap b/test/__snapshots__/index.test.ts.snap index ffd4c115..b0079b5a 100644 --- a/test/__snapshots__/index.test.ts.snap +++ b/test/__snapshots__/index.test.ts.snap @@ -118,6 +118,7 @@ on: - labeled - ready_for_review - reopened +concurrency: \${{ github.workflow }}-\${{ github.ref }} jobs: approve: runs-on: ubuntu-latest @@ -458,8 +459,7 @@ jobs: git config user.email "github-actions@github.com" - name: Setup Node.js uses: actions/setup-node@8f152de45cc393bb48ce5d89d36b731f54556e65 - with: - node-version: 16.14.0 + with: {} - name: Install dependencies run: yarn install --check-files --frozen-lockfile - name: build @@ -483,8 +483,7 @@ jobs: steps: - name: Setup Node.js uses: actions/setup-node@8f152de45cc393bb48ce5d89d36b731f54556e65 - with: - node-version: 16.14.0 + with: {} - name: Setup Go uses: actions/setup-go@93397bea11091df50f3d7e59dc26a7711a8bcfbe with: @@ -2824,6 +2823,7 @@ on: - labeled - ready_for_review - reopened +concurrency: \${{ github.workflow }}-\${{ github.ref }} jobs: approve: runs-on: ubuntu-latest @@ -3188,8 +3188,7 @@ jobs: git config user.email "github-actions@github.com" - name: Setup Node.js uses: actions/setup-node@8f152de45cc393bb48ce5d89d36b731f54556e65 - with: - node-version: 16.14.0 + with: {} - name: Install dependencies run: yarn install --check-files --frozen-lockfile - name: build @@ -3216,8 +3215,7 @@ jobs: steps: - name: Setup Node.js uses: actions/setup-node@8f152de45cc393bb48ce5d89d36b731f54556e65 - with: - node-version: 16.14.0 + with: {} - name: Setup Go uses: actions/setup-go@93397bea11091df50f3d7e59dc26a7711a8bcfbe with: @@ -5581,6 +5579,7 @@ on: - labeled - ready_for_review - reopened +concurrency: \${{ github.workflow }}-\${{ github.ref }} jobs: approve: runs-on: ubuntu-latest @@ -5921,8 +5920,7 @@ jobs: git config user.email "github-actions@github.com" - name: Setup Node.js uses: actions/setup-node@8f152de45cc393bb48ce5d89d36b731f54556e65 - with: - node-version: 16.14.0 + with: {} - name: Install dependencies run: yarn install --check-files --frozen-lockfile - name: build @@ -5946,8 +5944,7 @@ jobs: steps: - name: Setup Node.js uses: actions/setup-node@8f152de45cc393bb48ce5d89d36b731f54556e65 - with: - node-version: 16.14.0 + with: {} - name: Setup Go uses: actions/setup-go@93397bea11091df50f3d7e59dc26a7711a8bcfbe with: