diff --git a/.github/workflows/pr-backport.yaml b/.github/workflows/pr-backport.yaml index a7844efe3cc..1c8203357ba 100644 --- a/.github/workflows/pr-backport.yaml +++ b/.github/workflows/pr-backport.yaml @@ -696,7 +696,7 @@ jobs: steps: - name: Comment when release labels lack needs-backport env: - GH_TOKEN: ${{ github.token }} + GH_TOKEN: ${{ secrets.PR_GH_TOKEN || secrets.GH_TOKEN }} GH_REPO: ${{ github.repository }} PR_NUMBER: ${{ github.event.pull_request.number }} run: | diff --git a/scripts/cicd/backport-missing-trigger.test.ts b/scripts/cicd/backport-missing-trigger.test.ts index 66131e44a18..ce27b6113ad 100644 --- a/scripts/cicd/backport-missing-trigger.test.ts +++ b/scripts/cicd/backport-missing-trigger.test.ts @@ -12,15 +12,25 @@ import { join } from 'node:path' import { describe, expect, it, onTestFinished } from 'vitest' import { parse } from 'yaml' +interface WorkflowStep { + run?: string + env?: Record +} + +interface WorkflowJob { + env?: Record + steps?: WorkflowStep[] +} + interface Workflow { - jobs?: Record }> + jobs?: Partial> } const workflow = parse( readFileSync('.github/workflows/pr-backport.yaml', 'utf8') ) as Workflow -const warnScript = - workflow.jobs?.['warn-missing-needs-backport']?.steps?.[0]?.run ?? '' +const warnStep = workflow.jobs?.['warn-missing-needs-backport']?.steps?.[0] +const warnScript = warnStep?.run ?? '' const fakeGh = `#!/usr/bin/env bash set -euo pipefail @@ -260,4 +270,8 @@ describe('backport warning for release labels without needs-backport', () => { expect(result.stdout).toContain('::warning::') expect(result.stdout).toContain('core/1.57') }) + + it('posts with the same token the backport job uses, since the auto-provided one is refused', () => { + expect(warnStep?.env?.GH_TOKEN).toBe(workflow.jobs?.backport?.env?.GH_TOKEN) + }) })