Skip to content

Commit

Permalink
Fix Auto Merge Workflow
Browse files Browse the repository at this point in the history
  • Loading branch information
0x46616c6b committed Feb 1, 2024
1 parent 56035b4 commit e02d94a
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 7 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/auto-merge.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
11 changes: 5 additions & 6 deletions .github/workflows/cla.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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*

0 comments on commit e02d94a

Please sign in to comment.