From e02d94a7f6c8977dd64d5d2701de7ed63a1cf4b7 Mon Sep 17 00:00:00 2001 From: Falk Scheerschmidt Date: Thu, 1 Feb 2024 13:59:13 +0100 Subject: [PATCH] Fix Auto Merge Workflow --- .github/workflows/auto-merge.yml | 2 +- .github/workflows/cla.yml | 11 +++++------ 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/.github/workflows/auto-merge.yml b/.github/workflows/auto-merge.yml index 96996a9..8bf9aeb 100644 --- a/.github/workflows/auto-merge.yml +++ b/.github/workflows/auto-merge.yml @@ -19,5 +19,5 @@ jobs: - name: Merge PR run: | gh pr merge ${{ github.event.pull_request.html_url }} --merge --admin - env: + env: GITHUB_TOKEN: ${{ steps.get_token.outputs.token }} diff --git a/.github/workflows/cla.yml b/.github/workflows/cla.yml index 5612bcf..6d53353 100644 --- a/.github/workflows/cla.yml +++ b/.github/workflows/cla.yml @@ -4,11 +4,10 @@ on: issue_comment: types: [created] pull_request: - types: [opened,closed,synchronize] + types: [opened, closed, synchronize] jobs: CLAssistant: - runs-on: ubuntu-latest steps: @@ -19,7 +18,7 @@ jobs: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} PERSONAL_ACCESS_TOKEN: ${{ secrets.OSS_CONTRIBUTOR_LICENSE_AGREEMENT }} with: - path-to-signatures: 'signatures/version1/cla.json' - path-to-document: 'https://github.com/Staffbase/backstage-techdocs-action/blob/main/CLA.md' - branch: 'signatures' - allowlist: axdotl,flaxel,bot* + path-to-signatures: "signatures/version1/cla.json" + path-to-document: "https://github.com/Staffbase/backstage-techdocs-action/blob/main/CLA.md" + branch: "signatures" + allowlist: 0x46616c6b,axdotl,flaxel,bot*