From d8ba25967bd1b61cfeeea2b36c89aa3008f3e300 Mon Sep 17 00:00:00 2001 From: Kaizen Conroy Date: Fri, 21 Feb 2025 13:00:02 -0500 Subject: [PATCH 1/4] chore: fix codecov workflow --- .github/workflows/codecov.yml | 3 ++- .projenrc.ts | 2 +- projenrc/codecov.ts | 1 + 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/codecov.yml b/.github/workflows/codecov.yml index 6d72232c6..c57477d10 100644 --- a/.github/workflows/codecov.yml +++ b/.github/workflows/codecov.yml @@ -10,9 +10,10 @@ on: - main jobs: collect: + runs-on: ubuntu-latest permissions: id-token: write - if: github.repository == 'aws-cdk-cli/aws-cdk-cli' + if: github.repository == 'aws/aws-cdk-cli' steps: - name: Checkout uses: actions/checkout@v4 diff --git a/.projenrc.ts b/.projenrc.ts index 757afeff2..b43196f10 100644 --- a/.projenrc.ts +++ b/.projenrc.ts @@ -1280,7 +1280,7 @@ new CdkCliIntegTestsWorkflow(repo, { }); new CodeCovWorkflow(repo, { - restrictToRepos: ['aws-cdk-cli/aws-cdk-cli'], + restrictToRepos: ['aws/aws-cdk-cli'], packages: [cli.name], }); diff --git a/projenrc/codecov.ts b/projenrc/codecov.ts index 92219c8a3..57192ed8e 100644 --- a/projenrc/codecov.ts +++ b/projenrc/codecov.ts @@ -24,6 +24,7 @@ export class CodeCovWorkflow extends Component { }); this.workflow.addJob('collect', { + runsOn: ['ubuntu-latest'], permissions: { idToken: JobPermission.WRITE }, if: props.restrictToRepos.map(r => `github.repository == '${r}'`).join(' || '), steps: [ From 836f3b04b0fe89d0d640c43f622d6723bb50c026 Mon Sep 17 00:00:00 2001 From: Kaizen Conroy <36202692+kaizencc@users.noreply.github.com> Date: Fri, 21 Feb 2025 13:27:56 -0500 Subject: [PATCH 2/4] Apply suggestions from code review Co-authored-by: Momo Kornher --- projenrc/codecov.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projenrc/codecov.ts b/projenrc/codecov.ts index 57192ed8e..2235cb19a 100644 --- a/projenrc/codecov.ts +++ b/projenrc/codecov.ts @@ -24,7 +24,7 @@ export class CodeCovWorkflow extends Component { }); this.workflow.addJob('collect', { - runsOn: ['ubuntu-latest'], + runsOn: ['aws-cdk_ubuntu-latest_4-core'], permissions: { idToken: JobPermission.WRITE }, if: props.restrictToRepos.map(r => `github.repository == '${r}'`).join(' || '), steps: [ From 87aa793363a6e7a44833be98ac69033f8eab93d0 Mon Sep 17 00:00:00 2001 From: Kaizen Conroy Date: Fri, 21 Feb 2025 13:36:43 -0500 Subject: [PATCH 3/4] update --- .github/workflows/codecov.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/codecov.yml b/.github/workflows/codecov.yml index c57477d10..9e5a54a66 100644 --- a/.github/workflows/codecov.yml +++ b/.github/workflows/codecov.yml @@ -10,7 +10,7 @@ on: - main jobs: collect: - runs-on: ubuntu-latest + runs-on: aws-cdk_ubuntu-latest_4-core permissions: id-token: write if: github.repository == 'aws/aws-cdk-cli' From 1a269569c7901decda112b36d15b616964d6d4c4 Mon Sep 17 00:00:00 2001 From: Kaizen Conroy Date: Fri, 21 Feb 2025 18:40:02 -0500 Subject: [PATCH 4/4] empty commit