diff --git a/.github/PULL_REQUEST_TEMPLATE/gitlab.md b/.github/PULL_REQUEST_TEMPLATE/gitlab.md index 1313e5b720..d35d553f92 100644 --- a/.github/PULL_REQUEST_TEMPLATE/gitlab.md +++ b/.github/PULL_REQUEST_TEMPLATE/gitlab.md @@ -49,9 +49,16 @@ Connected issue: #4014 - [ ] Pushed merge commit to GitHub +### Operator (chain shortening) + +- [ ] Changed the target branch of the blocked PR to `develop` or this PR is not labeled `base` +- [ ] Removed the `chained` label from the blocked PR or this PR is not labeled `base` +- [ ] Removed the blocking relationship from the blocked PR or this PR is not labeled `base` +- [ ] Removed the `base` label from this PR or this PR is not labeled `base` + + ### Operator (after pushing the merge commit) -- [ ] Shortened the PR chain or this PR is not labeled `base` - [ ] Deleted PR branch from GitHub diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md index 5fddeb641a..39dc8d1465 100644 --- a/.github/pull_request_template.md +++ b/.github/pull_request_template.md @@ -126,9 +126,16 @@ Uncheck the *before every review* checklists. Update the `N reviews` label. - [ ] Pushed merge commit to GitHub +### Operator (chain shortening) + +- [ ] Changed the target branch of the blocked PR to `develop` or this PR is not labeled `base` +- [ ] Removed the `chained` label from the blocked PR or this PR is not labeled `base` +- [ ] Removed the blocking relationship from the blocked PR or this PR is not labeled `base` +- [ ] Removed the `base` label from this PR or this PR is not labeled `base` + + ### Operator (after pushing the merge commit) -- [ ] Shortened the PR chain or this PR is not labeled `base` - [ ] Pushed merge commit to GitLab `dev` or PR is labeled `no sandbox` - [ ] Pushed merge commit to GitLab `anvildev` or PR is labeled `no sandbox` - [ ] Build passes on GitLab `dev`1 diff --git a/.github/pull_request_template.md.template.py b/.github/pull_request_template.md.template.py index ad44c9b6b2..a94e992396 100644 --- a/.github/pull_request_template.md.template.py +++ b/.github/pull_request_template.md.template.py @@ -598,14 +598,29 @@ def main(): 'type': 'cli', 'content': 'Pushed merge commit to GitHub' }, + *iif(t in (T.default, T.gitlab), [ + { + 'type': 'h2', + 'content': 'Operator (chain shortening)' + }, + *[ + { + 'type': 'cli', + 'content': content, + 'alt': 'or this PR is not labeled `base`' + } + for content in [ + 'Changed the target branch of the blocked PR to `develop`', + 'Removed the `chained` label from the blocked PR', + 'Removed the blocking relationship from the blocked PR', + 'Removed the `base` label from this PR' + ] + ] + ]), { 'type': 'h2', 'content': 'Operator (after pushing the merge commit)' }, - iif(t in (T.default, T.gitlab), { - 'type': 'cli', - 'content': 'Shortened the PR chain', 'alt': 'or this PR is not labeled `base`' - }), *[ { 'type': 'cli', diff --git a/OPERATOR.rst b/OPERATOR.rst index 81da597319..a43a084e78 100644 --- a/OPERATOR.rst +++ b/OPERATOR.rst @@ -232,13 +232,6 @@ For an example of how to document failures within a PR `click here`_. .. _click here: https://github.com/DataBiosphere/azul/pull/3050#issuecomment-840033931 -Chain shortening -^^^^^^^^^^^^^^^^ - -Change the target branch of the blocked PR to ``develop`` and remove the ``chained`` -label from that PR. Remove the ``base`` label from the blocking PR. Lastly, remove the blocking -relationship. - Updating the AMI for GitLab instances ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^