From b7e19fee3c3b617001f69ddd093b40904726d546 Mon Sep 17 00:00:00 2001 From: Nazim Azeli Date: Wed, 9 Aug 2023 11:14:23 -0400 Subject: [PATCH 1/4] Updating contribution with jenkins changes --- CONTRIBUTING.rst | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CONTRIBUTING.rst b/CONTRIBUTING.rst index e9a5868c7..932031bac 100644 --- a/CONTRIBUTING.rst +++ b/CONTRIBUTING.rst @@ -37,6 +37,10 @@ Policy rules 3. Contributions will trigger a test suite that must successfully pass before being merged (or integrated). + * The test suite can be run using a different DACCS config with ``daccs_configs_branch: branch_name`` in the PR description. + * It is possible to skip the test suite if the latest commit contains either ``[skip ci]``, ``[ci skip]`` or ``[no ci]``. + To globally skip the test suite regardless of the commit message use ``daccs_skip_ci: true`` in the PR description. + 4. Contributions must be reviewed by every willing organizations (Default reviewers are `@tlvu`_ for `Ouranos`_ and `@MatProv`_ for `CRIM`_). From e0795206cbefd420696a0015f461fe3f5407a5a8 Mon Sep 17 00:00:00 2001 From: Nazim Azeli Date: Fri, 11 Aug 2023 08:40:17 -0400 Subject: [PATCH 2/4] Updating PR template --- .github/PULL_REQUEST_TEMPLATE.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index 94c30e6ca..65ad47b1e 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -25,3 +25,6 @@ List any dependencies that are required for this change. Links to other issues or sources. - [ ] Things to do... + +daccs_configs_branch: master +daccs_skip_ci: false From ab0662f0edf6cbcce9d241038a3e2b56b431f732 Mon Sep 17 00:00:00 2001 From: Nazim Azeli Date: Thu, 17 Aug 2023 15:38:31 -0400 Subject: [PATCH 3/4] Updating contribution with new variable name and PR template with added comment --- .github/PULL_REQUEST_TEMPLATE.md | 9 +++++++-- CONTRIBUTING.rst | 4 ++-- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index 65ad47b1e..5feab8a2a 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -26,5 +26,10 @@ Links to other issues or sources. - [ ] Things to do... -daccs_configs_branch: master -daccs_skip_ci: false + + +birdhouse_daccs_configs_branch: master +birdhouse_skip_ci: false diff --git a/CONTRIBUTING.rst b/CONTRIBUTING.rst index 932031bac..63aafb1d8 100644 --- a/CONTRIBUTING.rst +++ b/CONTRIBUTING.rst @@ -37,9 +37,9 @@ Policy rules 3. Contributions will trigger a test suite that must successfully pass before being merged (or integrated). - * The test suite can be run using a different DACCS config with ``daccs_configs_branch: branch_name`` in the PR description. + * The test suite can be run using a different DACCS config with ``birdhouse_daccs_configs_branch: branch_name`` in the PR description. * It is possible to skip the test suite if the latest commit contains either ``[skip ci]``, ``[ci skip]`` or ``[no ci]``. - To globally skip the test suite regardless of the commit message use ``daccs_skip_ci: true`` in the PR description. + To globally skip the test suite regardless of the commit message use ``birdhouse_skip_ci: true`` in the PR description. 4. Contributions must be reviewed by every willing organizations (Default reviewers are `@tlvu`_ for `Ouranos`_ and `@MatProv`_ for `CRIM`_). From e8569038d6bc1964d07d36d0f0e574b060ba82e1 Mon Sep 17 00:00:00 2001 From: Nazim Azeli Date: Thu, 31 Aug 2023 11:06:03 -0400 Subject: [PATCH 4/4] Updating contribution --- CONTRIBUTING.rst | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/CONTRIBUTING.rst b/CONTRIBUTING.rst index 63aafb1d8..4ebb316b9 100644 --- a/CONTRIBUTING.rst +++ b/CONTRIBUTING.rst @@ -42,11 +42,12 @@ Policy rules To globally skip the test suite regardless of the commit message use ``birdhouse_skip_ci: true`` in the PR description. 4. Contributions must be reviewed by every willing organizations - (Default reviewers are `@tlvu`_ for `Ouranos`_ and `@MatProv`_ for `CRIM`_). + (Default reviewers are `@mishaschwartz`_ for `UofT` , `@tlvu`_ for `Ouranos`_ and `@fmigneault`_ for `CRIM`_). +.. _@mishaschwartz: https://github.com/mishaschwartz .. _@tlvu: https://github.com/tlvu .. _Ouranos: https://github.com/Ouranosinc -.. _@MatProv: https://github.com/MatProv +.. _@fmigneault: https://github.com/fmigneault .. _CRIM: https://github.com/crim-ca 5. The reviews must be rigorous while respecting the initial scope.