From 1d447ab82a93ad28c960c409627fe0f8e21be3fb Mon Sep 17 00:00:00 2001 From: Bas van Dijk Date: Tue, 6 Aug 2024 12:43:01 +0000 Subject: [PATCH 1/9] chore: use a more friendly message when closing external PRs --- reusable_workflows/shared/messages.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/reusable_workflows/shared/messages.py b/reusable_workflows/shared/messages.py index ea6dafe..c3b6033 100644 --- a/reusable_workflows/shared/messages.py +++ b/reusable_workflows/shared/messages.py @@ -1,10 +1,11 @@ # Messages CLOSING_MESSAGE = """Dear @{}, -This repository does not accept external contributions yet. +Thank you for contributing! Unfortunately this repository does not accept external contributions yet. -We are therefore closing this Pull Request, thank you for your understanding. +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 mean time we unfortunately have to close this Pull Request. +We hope you understand and will come back once we accept external PRs. — The DFINITY Foundation""" From bccf3a968cc309d52f9fcd68e02328e6bec648a3 Mon Sep 17 00:00:00 2001 From: Bas van Dijk Date: Tue, 6 Aug 2024 14:48:51 +0200 Subject: [PATCH 2/9] Update reusable_workflows/shared/messages.py Co-authored-by: Nicolas Mattia --- reusable_workflows/shared/messages.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/reusable_workflows/shared/messages.py b/reusable_workflows/shared/messages.py index c3b6033..864f510 100644 --- a/reusable_workflows/shared/messages.py +++ b/reusable_workflows/shared/messages.py @@ -3,7 +3,7 @@ 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 mean time we unfortunately have to close this Pull Request. +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. From e3cfbc716fcaed5c16bbc60f0b46cc999a998664 Mon Sep 17 00:00:00 2001 From: Carly Gundy Date: Thu, 5 Sep 2024 14:30:49 +0200 Subject: [PATCH 3/9] fix(IDX): change closing message --- .github/workflows/check_cla.yml | 12 +++++++----- reusable_workflows/shared/messages.py | 10 ---------- 2 files changed, 7 insertions(+), 15 deletions(-) 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/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 @{}, From 032851f3abe1e128a133c4ea452030af5483f368 Mon Sep 17 00:00:00 2001 From: Carly Gundy <47304080+cgundy@users.noreply.github.com> Date: Thu, 5 Sep 2024 15:24:08 +0200 Subject: [PATCH 4/9] test(IDX): try with new tag --- .github/workflows/check_cla_dev.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/check_cla_dev.yml b/.github/workflows/check_cla_dev.yml index d6fd646..378b572 100644 --- a/.github/workflows/check_cla_dev.yml +++ b/.github/workflows/check_cla_dev.yml @@ -11,5 +11,5 @@ on: jobs: call-check-cla: - uses: ./.github/workflows/check_cla.yml + uses: ./.github/workflows/check_cla.yml@manual-05-09-2024 secrets: inherit From 46593ff5d884ae4d41e3c086aead0410ee28912b Mon Sep 17 00:00:00 2001 From: Carly Gundy <47304080+cgundy@users.noreply.github.com> Date: Thu, 5 Sep 2024 15:24:51 +0200 Subject: [PATCH 5/9] Update check_cla_dev.yml --- .github/workflows/check_cla_dev.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/check_cla_dev.yml b/.github/workflows/check_cla_dev.yml index 378b572..d53daf3 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/** From 9e9ce6b088f1d5c2bb8f3e889d23395e3ba24455 Mon Sep 17 00:00:00 2001 From: Carly Gundy <47304080+cgundy@users.noreply.github.com> Date: Thu, 5 Sep 2024 15:26:18 +0200 Subject: [PATCH 6/9] Update check_cla_dev.yml --- .github/workflows/check_cla_dev.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/check_cla_dev.yml b/.github/workflows/check_cla_dev.yml index d53daf3..d3662df 100644 --- a/.github/workflows/check_cla_dev.yml +++ b/.github/workflows/check_cla_dev.yml @@ -12,5 +12,5 @@ on: jobs: call-check-cla: - uses: ./.github/workflows/check_cla.yml@manual-05-09-2024 + uses: dfinity/public-workflows/.github/workflows/check_cla.yml@manual-05-09-2024 secrets: inherit From e36766e907bc161278922c9c136a7d2704776f05 Mon Sep 17 00:00:00 2001 From: Carly Gundy <47304080+cgundy@users.noreply.github.com> Date: Thu, 5 Sep 2024 15:28:36 +0200 Subject: [PATCH 7/9] Update check_cla_ruleset.yml --- .github/workflows/check_cla_ruleset.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 From 08e952cfbc74fd12f26edfa3ca7db0dcb87822f3 Mon Sep 17 00:00:00 2001 From: Carly Gundy <47304080+cgundy@users.noreply.github.com> Date: Thu, 5 Sep 2024 15:31:18 +0200 Subject: [PATCH 8/9] change it back --- .github/workflows/check_cla_dev.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/check_cla_dev.yml b/.github/workflows/check_cla_dev.yml index d3662df..ea1e3a9 100644 --- a/.github/workflows/check_cla_dev.yml +++ b/.github/workflows/check_cla_dev.yml @@ -12,5 +12,5 @@ on: jobs: call-check-cla: - uses: dfinity/public-workflows/.github/workflows/check_cla.yml@manual-05-09-2024 + uses: ./.github/workflows/check_cla.yml secrets: inherit From 8e07cb365a3fa37b3717767723f024616db8a558 Mon Sep 17 00:00:00 2001 From: Carly Gundy <47304080+cgundy@users.noreply.github.com> Date: Thu, 5 Sep 2024 15:40:57 +0200 Subject: [PATCH 9/9] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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`.