diff --git a/.github/workflows/auto-approve.yml b/.github/workflows/auto-approve.yml index 698d719..647b7e7 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.head_ref }} jobs: approve: runs-on: ubuntu-latest diff --git a/.github/workflows/automerge.yml b/.github/workflows/automerge.yml index 5593a78..217a9df 100644 --- a/.github/workflows/automerge.yml +++ b/.github/workflows/automerge.yml @@ -9,7 +9,7 @@ on: - ready_for_review - reopened - synchronize -concurrency: ${{ github.workflow }}-${{ github.ref }} +concurrency: ${{ github.workflow }}-${{ github.head_ref }} jobs: automerge: runs-on: ubuntu-latest diff --git a/.projen/deps.json b/.projen/deps.json index 77d24e4..0cc18a1 100644 --- a/.projen/deps.json +++ b/.projen/deps.json @@ -105,6 +105,7 @@ }, { "name": "typescript", + "version": "~5.2.0", "type": "build" }, { diff --git a/.projen/tasks.json b/.projen/tasks.json index cc8b42b..5d06eec 100644 --- a/.projen/tasks.json +++ b/.projen/tasks.json @@ -279,13 +279,13 @@ }, "steps": [ { - "exec": "npx npm-check-updates@16 --upgrade --target=minor --peer --dep=dev,peer,prod,optional --filter=@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,jest,jest-junit,jsii-diff,jsii-docgen,jsii-pacmak,prettier,projen,standard-version,ts-jest,ts-node,typescript" + "exec": "npx npm-check-updates@16 --upgrade --target=minor --peer --dep=dev,peer,prod,optional --filter=@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,jest,jest-junit,jsii-diff,jsii-docgen,jsii-pacmak,prettier,projen,standard-version,ts-jest,ts-node" }, { "exec": "yarn install --check-files" }, { - "exec": "yarn upgrade @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 jest jest-junit jsii-diff jsii-docgen jsii-pacmak prettier projen standard-version ts-jest ts-node typescript" + "exec": "yarn upgrade @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 jest jest-junit jsii-diff jsii-docgen jsii-pacmak prettier projen standard-version ts-jest ts-node" }, { "exec": "npx projen" diff --git a/.projenrc.ts b/.projenrc.ts index 2d94712..9570acb 100644 --- a/.projenrc.ts +++ b/.projenrc.ts @@ -35,6 +35,7 @@ const project = new ConstructLibraryCdktf({ repositoryUrl: "https://github.com/cdktf/cdktf-multi-stack-tfe.git", description: `Sets up TFE / TFC workspaces for all stacks based on a seed stack.`, jsiiVersion: "~5.2.0", + typescriptVersion: "~5.2.0", // should always be the same major/minor as JSII licensed: false, prettier: true, projenrcTs: true, diff --git a/package.json b/package.json index 56e99a7..ba8c2ef 100644 --- a/package.json +++ b/package.json @@ -61,7 +61,7 @@ "standard-version": "^9", "ts-jest": "^29", "ts-node": "^10.9.1", - "typescript": "~5.3.3" + "typescript": "~5.2.0" }, "peerDependencies": { "@cdktf/provider-tfe": ">=10.0.0", diff --git a/projenrc/auto-approve.ts b/projenrc/auto-approve.ts index 35fe1ed..b560b4b 100644 --- a/projenrc/auto-approve.ts +++ b/projenrc/auto-approve.ts @@ -21,6 +21,9 @@ export class AutoApprove { }, }); + (workflow.concurrency as any) = + "${{ github.workflow }}-${{ github.head_ref }}"; + const maintainerStatuses = `fromJSON('["OWNER", "MEMBER", "COLLABORATOR"]')`; workflow.addJobs({ approve: { diff --git a/projenrc/automerge.ts b/projenrc/automerge.ts index aec07cc..b97534d 100644 --- a/projenrc/automerge.ts +++ b/projenrc/automerge.ts @@ -27,7 +27,8 @@ export class Automerge { }, }); - (workflow.concurrency as any) = "${{ github.workflow }}-${{ github.ref }}"; + (workflow.concurrency as any) = + "${{ github.workflow }}-${{ github.head_ref }}"; const maintainerStatuses = `fromJSON('["OWNER", "MEMBER", "COLLABORATOR"]')`; workflow.addJobs({ diff --git a/yarn.lock b/yarn.lock index e7b4c0b..860887f 100644 --- a/yarn.lock +++ b/yarn.lock @@ -6359,16 +6359,11 @@ typescript@~3.9.10: resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.9.10.tgz#70f3910ac7a51ed6bef79da7800690b19bf778b8" integrity sha512-w6fIxVE/H1PkLKcCPsFqKE7Kv7QUwhU8qQY2MueZXWx5cPZdwFupLgKK3vntcK98BtNHZtAF4LA/yl2a7k8R6Q== -typescript@~5.2, typescript@~5.2.2: +typescript@~5.2, typescript@~5.2.0, typescript@~5.2.2: version "5.2.2" resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.2.2.tgz#5ebb5e5a5b75f085f22bc3f8460fba308310fa78" integrity sha512-mI4WrpHsbCIcwT9cF4FZvr80QUeKvsUsUvKDoR+X/7XHQH98xYD8YHZg7ANtz2GtZt/CBq2QJ0thkGJMHfqc1w== -typescript@~5.3.3: - version "5.3.3" - resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.3.3.tgz#b3ce6ba258e72e6305ba66f5c9b452aaee3ffe37" - integrity sha512-pXWcraxM0uxAS+tN0AG/BF2TyqmHO014Z070UsJ+pFvYuRSq8KH8DmWpnbXe0pEPDHXZV3FcAbJkijJ5oNEnWw== - uglify-js@^3.1.4: version "3.17.4" resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.17.4.tgz#61678cf5fa3f5b7eb789bb345df29afb8257c22c"