From f5fb87f01c3f0096a75fc491dbc0ed513a13fa56 Mon Sep 17 00:00:00 2001 From: ylakhdar Date: Mon, 12 Jun 2023 14:50:59 -0400 Subject: [PATCH 1/6] fix: adjust script path --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index f76a7165..e5a2860b 100644 --- a/package.json +++ b/package.json @@ -12,7 +12,7 @@ "@octokit/auth-app": "^4.0.9" }, "scripts": { - "get-token": "node get-token.mjs" + "get-token": "node utils/get-token.mjs" }, "commitlint": { "extends": [ From 88d23dc3c0037041d8fdcffa44ce6b30e2da7e8a Mon Sep 17 00:00:00 2001 From: ylakhdar Date: Mon, 12 Jun 2023 14:58:24 -0400 Subject: [PATCH 2/6] ci: add missing env secrets --- .github/workflows/release.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index f8e389a4..0d2221d0 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -22,6 +22,12 @@ jobs: - name: Get Release Token run: npm run get-token + env: + RELEASER_APP_ID: ${{ secrets.RELEASER_APP_ID }} + RELEASER_PRIVATE_KEY: ${{ secrets.RELEASER_PRIVATE_KEY }} + RELEASER_CLIENT_ID: ${{ secrets.RELEASER_CLIENT_ID }} + RELEASER_CLIENT_SECRET: ${{ secrets.RELEASER_CLIENT_SECRET }} + RELEASER_INSTALLATION_ID: ${{ secrets.RELEASER_INSTALLATION_ID }} - uses: actions/setup-java@v3 name: Set up Java From ec6e0b66fcbe17f7ae05c4603cb3aafb5bd053ee Mon Sep 17 00:00:00 2001 From: ylakhdar Date: Mon, 12 Jun 2023 15:01:58 -0400 Subject: [PATCH 3/6] ci: add missing export --- utils/get-token.mjs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/utils/get-token.mjs b/utils/get-token.mjs index 1660f6ad..8e4b1286 100644 --- a/utils/get-token.mjs +++ b/utils/get-token.mjs @@ -1,5 +1,5 @@ import {createAppAuth} from '@octokit/auth-app'; -import {setSecret} from '@actions/core' +import {setSecret, exportVariable} from '@actions/core' const auth = createAppAuth({ appId: process.env.RELEASER_APP_ID, From ada43df923e28a2e7750a0a4642218812235b3b8 Mon Sep 17 00:00:00 2001 From: ylakhdar Date: Tue, 13 Jun 2023 09:47:16 -0400 Subject: [PATCH 4/6] ci: read value from context --- .github/workflows/release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 0d2221d0..eb02863a 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -45,4 +45,4 @@ jobs: package-name: release-please-action default-branch: main pull-request-title-pattern: 'chore${scope}: release${component} ${version} [skip-ci]' - token: $RELEASE_TOKEN + token: ${{ env.RELEASE_TOKEN }} From 42b345991d55d99dfb8ab321694a8fea59d5e24c Mon Sep 17 00:00:00 2001 From: ylakhdar Date: Tue, 13 Jun 2023 10:09:43 -0400 Subject: [PATCH 5/6] ci: fix github actor --- .github/workflows/auto-approve-renovate.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/auto-approve-renovate.yml b/.github/workflows/auto-approve-renovate.yml index 1ef4f095..95133530 100644 --- a/.github/workflows/auto-approve-renovate.yml +++ b/.github/workflows/auto-approve-renovate.yml @@ -10,7 +10,7 @@ on: jobs: auto-approve: runs-on: ubuntu-latest - if: (github.actor == 'developer-experience-bot[bot]') && (contains(join(github.event.pull_request.labels.*.name), 'snpashot')) + if: (github.actor == 'developer-experience-bot') && (contains(join(github.event.pull_request.labels.*.name), 'snpashot')) steps: - name: auto-approve id: auto-approve From 07ba2542c3d71894810339e8b19e357ed597725b Mon Sep 17 00:00:00 2001 From: ylakhdar Date: Tue, 13 Jun 2023 15:25:29 -0400 Subject: [PATCH 6/6] ci: use expression syntax --- .github/workflows/auto-approve-renovate.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/auto-approve-renovate.yml b/.github/workflows/auto-approve-renovate.yml index 95133530..ce48a784 100644 --- a/.github/workflows/auto-approve-renovate.yml +++ b/.github/workflows/auto-approve-renovate.yml @@ -10,7 +10,7 @@ on: jobs: auto-approve: runs-on: ubuntu-latest - if: (github.actor == 'developer-experience-bot') && (contains(join(github.event.pull_request.labels.*.name), 'snpashot')) + if: "${{ (github.actor == 'developer-experience-bot[bot]') && contains(github.event.pull_request.labels.*.name, 'autorelease: snapshot') }}" steps: - name: auto-approve id: auto-approve