From eba3646fc3cd6aae6c1390a99b9ef8fb68a6edd4 Mon Sep 17 00:00:00 2001 From: Buckley Date: Wed, 28 Feb 2024 13:14:06 -0800 Subject: [PATCH 1/2] using GITHUB_TOKEN vs. PROJEN_GITHUB_TOKEN --- .github/workflows/build.yml | 2 +- .github/workflows/upgrade-main.yml | 2 +- .projenrc.ts | 1 + 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index fda2b9a4..eb513334 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -64,7 +64,7 @@ jobs: - name: Checkout uses: actions/checkout@v4 with: - token: ${{ secrets.PROJEN_GITHUB_TOKEN }} + token: ${{ secrets.GITHUB_TOKEN }} ref: ${{ github.event.pull_request.head.ref }} repository: ${{ github.event.pull_request.head.repo.full_name }} - name: Download patch diff --git a/.github/workflows/upgrade-main.yml b/.github/workflows/upgrade-main.yml index fcac32fb..72c333ca 100644 --- a/.github/workflows/upgrade-main.yml +++ b/.github/workflows/upgrade-main.yml @@ -65,7 +65,7 @@ jobs: id: create-pr uses: peter-evans/create-pull-request@v6 with: - token: ${{ secrets.PROJEN_GITHUB_TOKEN }} + token: ${{ secrets.GITHUB_TOKEN }} commit-message: |- chore(deps): upgrade dependencies diff --git a/.projenrc.ts b/.projenrc.ts index c4f0b37d..54638cc5 100644 --- a/.projenrc.ts +++ b/.projenrc.ts @@ -36,6 +36,7 @@ const project = new awscdk.AwsCdkConstructLibrary({ prettier: true, projenrcTs: true, projenVersion: PROJEN_VERSION, + projenTokenSecret: 'GITHUB_TOKEN', repositoryUrl: `https://github.com/${GITHUB_USER}/${PROJECT_NAME}`, sampleCode: false, stability: 'experimental', From f7e1803d2b63acf428697e68cbb39241fd85aa72 Mon Sep 17 00:00:00 2001 From: Buckley Date: Wed, 28 Feb 2024 13:25:38 -0800 Subject: [PATCH 2/2] used projenCredentials vs. projentTokenSecret --- .projenrc.ts | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.projenrc.ts b/.projenrc.ts index 54638cc5..2945902e 100644 --- a/.projenrc.ts +++ b/.projenrc.ts @@ -2,6 +2,7 @@ // SPDX-License-Identifier: Apache-2.0 import { awscdk, javascript } from 'projen'; +import { GithubCredentials } from 'projen/lib/github'; import { NpmAccess } from 'projen/lib/javascript'; const GITHUB_USER = 'awslabs'; @@ -36,7 +37,6 @@ const project = new awscdk.AwsCdkConstructLibrary({ prettier: true, projenrcTs: true, projenVersion: PROJEN_VERSION, - projenTokenSecret: 'GITHUB_TOKEN', repositoryUrl: `https://github.com/${GITHUB_USER}/${PROJECT_NAME}`, sampleCode: false, stability: 'experimental', @@ -46,6 +46,9 @@ const project = new awscdk.AwsCdkConstructLibrary({ npmAccess: NpmAccess.PUBLIC, githubOptions: { + projenCredentials: GithubCredentials.fromPersonalAccessToken({ + secret: 'GITHUB_TOKEN', + }), pullRequestLintOptions: { contributorStatement: 'By submitting this pull request, I confirm that you can use, modify, copy, and redistribute this contribution, under the terms of the project license.',