From 53e879abfc418cd6db4a0a614dda5c141c3c743c Mon Sep 17 00:00:00 2001 From: Luca Comellini Date: Mon, 9 Sep 2024 07:59:19 -0700 Subject: [PATCH] Update CLA workflow (#837) --- .github/workflows/f5-cla.yml | 37 +++++++++++++++++++++++------------- CONTRIBUTING.md | 5 ++--- 2 files changed, 26 insertions(+), 16 deletions(-) diff --git a/.github/workflows/f5-cla.yml b/.github/workflows/f5-cla.yml index 677ce4f5..de0dbc8a 100644 --- a/.github/workflows/f5-cla.yml +++ b/.github/workflows/f5-cla.yml @@ -1,17 +1,28 @@ ---- name: F5 CLA + on: issue_comment: - types: [created] + types: + - created pull_request_target: - types: [opened, closed, synchronize] -permissions: read-all + types: + - opened + - synchronize + - reopened + +concurrency: + group: ${{ github.ref_name }}-cla + +permissions: + contents: read + jobs: f5-cla: name: F5 CLA runs-on: ubuntu-22.04 permissions: actions: write + contents: read pull-requests: write statuses: write steps: @@ -20,19 +31,19 @@ jobs: uses: contributor-assistant/github-action@f41946747f85d28e9a738f4f38dbcc74b69c7e0e # v2.5.1 with: # Any pull request targeting the following branch will trigger a CLA check. - branch: 'main' + branch: "main" # Path to the CLA document. - path-to-document: 'https://github.com/f5/.github/blob/main/CLA/cla-markdown.md' + path-to-document: "https://github.com/f5/.github/blob/main/CLA/cla-markdown.md" # Custom CLA messages. - custom-notsigned-prcomment: '🎉 Thank you for your contribution! It appears you have not yet signed the F5 Contributor License Agreement (CLA), which is required for your changes to be incorporated into an F5 Open Source Software (OSS) project. Please kindly read the [F5 CLA](https://github.com/f5/.github/blob/main/CLA/cla-markdown.md) and reply on a new comment with the following text to agree:' - custom-pr-sign-comment: 'I have hereby read the F5 CLA and agree to its terms' - custom-allsigned-prcomment: '✅ All required contributors have signed the F5 CLA for this PR. Thank you!' + custom-notsigned-prcomment: "🎉 Thank you for your contribution! It appears you have not yet signed the F5 Contributor License Agreement (CLA), which is required for your changes to be incorporated into an F5 Open Source Software (OSS) project. Please kindly read the [F5 CLA](https://github.com/f5/.github/blob/main/CLA/cla-markdown.md) and reply on a new comment with the following text to agree:" + custom-pr-sign-comment: "I have hereby read the F5 CLA and agree to its terms" + custom-allsigned-prcomment: "✅ All required contributors have signed the F5 CLA for this PR. Thank you!" # Remote repository storing CLA signatures. - remote-organization-name: 'f5' - remote-repository-name: 'f5-cla-data' - path-to-signatures: 'signatures/beta/signatures.json' + remote-organization-name: "f5" + remote-repository-name: "f5-cla-data" + path-to-signatures: "signatures/beta/signatures.json" # Comma separated list of usernames for maintainers or any other individuals who should not be prompted for a CLA. - allowlist: lucacome, pleshakov, bot* + allowlist: bot* # Do not lock PRs after a merge. lock-pullrequest-aftermerge: false env: diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index d82ab92d..44c6cbb7 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -71,9 +71,8 @@ issue template. ### F5 Contributor License Agreement (CLA) -F5 requires all external contributors to agree to the terms of the F5 CLA -(available [here](https://github.com/f5/.github/blob/main/CLA/cla-markdown.md)) before any of their changes can be -incorporated into an F5 Open Source repository. +F5 requires all external contributors to agree to the terms of the F5 CLA (available [here](https://github.com/f5/.github/blob/main/CLA/cla-markdown.md)) +before any of their changes can be incorporated into an F5 Open Source repository. If you have not yet agreed to the F5 CLA terms and submit a PR to this repository, a bot will prompt you to view and agree to the F5 CLA. You will have to agree to the F5 CLA terms through a comment in the PR before any of your changes