diff --git a/.github/workflows/check_cla.yml b/.github/workflows/check_cla.yml index fb1e814..61e1142 100644 --- a/.github/workflows/check_cla.yml +++ b/.github/workflows/check_cla.yml @@ -77,11 +77,13 @@ jobs: uses: superbrothers/close-pull-request@v3 with: comment: | - "This repository does not accept external contributions yet. - - We are therefore closing this Pull Request, thank you for your understanding. - - — The DFINITY Foundation" + Thank you for contributing! Unfortunately this repository does not accept external contributions yet. + + We are working on enabling this by aligning our internal processes and our CI setup to handle external contributions. However this will take some time to set up so in the meantime we unfortunately have to close this Pull Request. + + We hope you understand and will come back once we accept external PRs. + + — The DFINITY Foundation""" - name: Add Label uses: actions/github-script@v6 diff --git a/.github/workflows/check_cla_dev.yml b/.github/workflows/check_cla_dev.yml index d6fd646..ea1e3a9 100644 --- a/.github/workflows/check_cla_dev.yml +++ b/.github/workflows/check_cla_dev.yml @@ -6,6 +6,7 @@ on: pull_request: paths: - .github/workflows/check_cla.yml + - .github/workflows/check_cla_dev.yml - reusable_workflows/check_cla/** - reusable_workflows/check_membership/** diff --git a/.github/workflows/check_cla_ruleset.yml b/.github/workflows/check_cla_ruleset.yml index cf7b774..8ba1532 100644 --- a/.github/workflows/check_cla_ruleset.yml +++ b/.github/workflows/check_cla_ruleset.yml @@ -13,5 +13,5 @@ on: jobs: call-check-cla: - uses: dfinity/public-workflows/.github/workflows/check_cla.yml@main + uses: dfinity/public-workflows/.github/workflows/check_cla.yml@manual-05-09-2024 secrets: inherit diff --git a/README.md b/README.md index 36e04d7..fcb73e2 100644 --- a/README.md +++ b/README.md @@ -13,4 +13,4 @@ If a new change needs to be deployed a new tag needs to be created. Currently th git tag git push origin --tags ``` -This will allow you to test out the workflow first if you'd like (we have a ruleset called CLA check (dev)), otherwise update the main ruleset CLA-check with the correct tag. +Then update the tag in the workflow `.github/workflows/check_cla_ruleset.yml`. diff --git a/reusable_workflows/shared/messages.py b/reusable_workflows/shared/messages.py index 864f510..1c8e028 100644 --- a/reusable_workflows/shared/messages.py +++ b/reusable_workflows/shared/messages.py @@ -1,14 +1,4 @@ # Messages -CLOSING_MESSAGE = """Dear @{}, - -Thank you for contributing! Unfortunately this repository does not accept external contributions yet. - -We are working on enabling this by aligning our internal processes and our CI setup to handle external contributions. However this will take some time to set up so in the meantime we unfortunately have to close this Pull Request. - -We hope you understand and will come back once we accept external PRs. - -— The DFINITY Foundation""" - USER_AGREEMENT_MESSAGE = "I, {}, hereby agree to the DFINITY Foundation's CLA." CLA_MESSAGE = """Dear @{},