From 344992dd0302ee187449442e29c7f7a8912c6650 Mon Sep 17 00:00:00 2001 From: Nara Kasbergen Date: Mon, 11 Dec 2023 13:33:25 +0100 Subject: [PATCH 1/3] chore(ci): use github.head_ref instead of .ref for concurrency --- .github/workflows/auto-approve.yml | 2 +- .github/workflows/automerge.yml | 2 +- src/auto-approve.ts | 3 ++- src/automerge.ts | 3 ++- 4 files changed, 6 insertions(+), 4 deletions(-) diff --git a/.github/workflows/auto-approve.yml b/.github/workflows/auto-approve.yml index b12de6e9..647b7e70 100644 --- a/.github/workflows/auto-approve.yml +++ b/.github/workflows/auto-approve.yml @@ -8,7 +8,7 @@ on: - labeled - ready_for_review - reopened -concurrency: ${{ github.workflow }}-${{ github.ref }} +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 1e3b12f1..38d95422 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/src/auto-approve.ts b/src/auto-approve.ts index 40054615..fb713594 100644 --- a/src/auto-approve.ts +++ b/src/auto-approve.ts @@ -21,7 +21,8 @@ export class AutoApprove { }, }); - (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/src/automerge.ts b/src/automerge.ts index da2dfbe9..bc27e549 100644 --- a/src/automerge.ts +++ b/src/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({ From 8566afb51e57e17314b3016afbed605b8bba54da Mon Sep 17 00:00:00 2001 From: Nara Kasbergen Date: Mon, 11 Dec 2023 13:34:52 +0100 Subject: [PATCH 2/3] chore(deps): upgrade dessant/lock-threads --- .github/workflows/lock.yml | 2 +- .projenrc.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/lock.yml b/.github/workflows/lock.yml index 2c3b64e1..15d9ca5e 100644 --- a/.github/workflows/lock.yml +++ b/.github/workflows/lock.yml @@ -11,7 +11,7 @@ jobs: pull-requests: write issues: write steps: - - uses: dessant/lock-threads@d42e5f49803f3c4e14ffee0378e31481265dda22 + - uses: dessant/lock-threads@1bf7ec25051fe7c00bdd17e6a7cf3d7bfb7dc771 with: issue-comment: I'm going to lock this issue because it has been closed for at least 7 days. This helps our maintainers find and focus on the active issues. If you've found a problem that seems similar to this, please [open a new issue](https://github.com/cdktf/cdktf-provider-project/issues/new) so we can investigate further. issue-inactive-days: 7 diff --git a/.projenrc.ts b/.projenrc.ts index ac38dc88..c5797a2d 100644 --- a/.projenrc.ts +++ b/.projenrc.ts @@ -19,7 +19,7 @@ const githubActionPinnedVersions = { "actions/upload-artifact": "a8a3f3ad30e3422c9c7b888a15615d19a852ae32", // v3.1.3 "amannn/action-semantic-pull-request": "e9fabac35e210fea40ca5b14c0da95a099eff26f", // v5.4.0 - "dessant/lock-threads": "d42e5f49803f3c4e14ffee0378e31481265dda22", // v5.0.0 + "dessant/lock-threads": "1bf7ec25051fe7c00bdd17e6a7cf3d7bfb7dc771", // v5.0.1 "peter-evans/create-pull-request": "153407881ec5c347639a548ade7d8ad1d6740e38", // v5.0.2 }; From 667df5c7ec3fcc0660afa921a196f45b809e57b1 Mon Sep 17 00:00:00 2001 From: team-tf-cdk Date: Mon, 11 Dec 2023 12:36:31 +0000 Subject: [PATCH 3/3] chore: self mutation Signed-off-by: team-tf-cdk --- test/__snapshots__/index.test.ts.snap | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/test/__snapshots__/index.test.ts.snap b/test/__snapshots__/index.test.ts.snap index 3509dc88..1f806265 100644 --- a/test/__snapshots__/index.test.ts.snap +++ b/test/__snapshots__/index.test.ts.snap @@ -118,7 +118,7 @@ on: - labeled - ready_for_review - reopened -concurrency: \${{ github.workflow }}-\${{ github.ref }} +concurrency: \${{ github.workflow }}-\${{ github.head_ref }} jobs: approve: runs-on: ubuntu-latest @@ -204,7 +204,7 @@ on: - ready_for_review - reopened - synchronize -concurrency: \${{ github.workflow }}-\${{ github.ref }} +concurrency: \${{ github.workflow }}-\${{ github.head_ref }} jobs: automerge: runs-on: ubuntu-latest @@ -2796,7 +2796,7 @@ on: - labeled - ready_for_review - reopened -concurrency: \${{ github.workflow }}-\${{ github.ref }} +concurrency: \${{ github.workflow }}-\${{ github.head_ref }} jobs: approve: runs-on: ubuntu-latest @@ -2882,7 +2882,7 @@ on: - ready_for_review - reopened - synchronize -concurrency: \${{ github.workflow }}-\${{ github.ref }} +concurrency: \${{ github.workflow }}-\${{ github.head_ref }} jobs: automerge: runs-on: ubuntu-latest @@ -5525,7 +5525,7 @@ on: - labeled - ready_for_review - reopened -concurrency: \${{ github.workflow }}-\${{ github.ref }} +concurrency: \${{ github.workflow }}-\${{ github.head_ref }} jobs: approve: runs-on: ubuntu-latest @@ -5611,7 +5611,7 @@ on: - ready_for_review - reopened - synchronize -concurrency: \${{ github.workflow }}-\${{ github.ref }} +concurrency: \${{ github.workflow }}-\${{ github.head_ref }} jobs: automerge: runs-on: ubuntu-latest