From 701f721ff9c4d22b46e625533f024d7e58cf906b Mon Sep 17 00:00:00 2001 From: Adam Novak Date: Wed, 27 Nov 2024 13:02:02 -0500 Subject: [PATCH] Test smarter, not harder (#5166) * Suppress rebases Make Dependabot not rebase or try to touch packages for stuff not under CI. Stop Github from auto-rebasing all PRs for us. * Make merge checklist say you can check if a review has been addressed --------- Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> --- .github/PULL_REQUEST_TEMPLATE.md | 8 ++++---- .github/dependabot.yml | 11 +++++++++++ .github/workflows/autoupdate.yaml | 24 ------------------------ docs/contributing/checklists.rst | 4 ++-- 4 files changed, 17 insertions(+), 30 deletions(-) delete mode 100644 .github/workflows/autoupdate.yaml diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index 6fdb588440..1d0a7a63b4 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -5,7 +5,7 @@ To be copied to the [draft changelog](https://github.com/DataBiosphere/toil/wiki ## Reviewer Checklist - + * [ ] Make sure it is coming from `issues/XXXX-fix-the-thing` in the Toil repo, or from an external repo. * [ ] If it is coming from an external repo, make sure to pull it in for CI with: @@ -26,10 +26,10 @@ To be copied to the [draft changelog](https://github.com/DataBiosphere/toil/wiki ## Merger Checklist - + -* [ ] Make sure the PR passes tests. -* [ ] Make sure the PR has been reviewed **since its last modification**. If not, review it. +* [ ] Make sure the PR passed tests, including the Gitlab tests, for the most recent commit in its branch. +* [ ] Make sure the PR has been reviewed. If not, review it. If it has been reviewed and any requested changes seem to have been addressed, proceed. * [ ] Merge with the Github "Squash and merge" feature. * [ ] If there are multiple authors' commits, add [Co-authored-by](https://github.blog/2018-01-29-commit-together-with-co-authors/) to give credit to all contributing authors. * [ ] Copy its recommended changelog entry to the [Draft Changelog](https://github.com/DataBiosphere/toil/wiki/Draft-Changelog). diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 17ad7c2c7d..2e2dc52e1b 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -4,7 +4,18 @@ updates: directory: "/" # Location of package manifests schedule: interval: "daily" + ignore: + # htcondor is not under CI + - dependency-name: "htcondor" + # Google cloud/storage is not under CI + - dependency-name: "apache-libcloud" + - dependency-name: "google-cloud-storage" + - dependency-name: "google-auth" - package-ecosystem: "github-actions" directory: "/" schedule: interval: "weekly" +# Don't constantly rebase all the dependency bump PRs whenever anything else +# merges; this causes too many CI runs. +rebase-strategy: ignore + diff --git a/.github/workflows/autoupdate.yaml b/.github/workflows/autoupdate.yaml deleted file mode 100644 index de09cfc9a4..0000000000 --- a/.github/workflows/autoupdate.yaml +++ /dev/null @@ -1,24 +0,0 @@ -# Auto-update PRs when other PRs are merged. -# See https://github.com/marketplace/actions/auto-update - -name: autoupdate -on: - push: - branches: - - master -jobs: - autoupdate: - name: autoupdate - runs-on: ubuntu-22.04 - steps: - - uses: docker://chinthakagodawita/autoupdate-action:v1 - env: - GITHUB_TOKEN: '${{ secrets.GITHUB_TOKEN }}' - # Work on PRs against branches that are protected (so they need to be - # up to date) - PR_FILTER: "protected" - # Don't work on draft PRs - PR_READY_STATE: "ready_for_review" - # Don't fail on the triggering commit if it makes a merge conflict - # with a PR and the PR can't update - MERGE_CONFLICT_ACTION: "ignore" diff --git a/docs/contributing/checklists.rst b/docs/contributing/checklists.rst index dedb989482..b3bc2b364f 100644 --- a/docs/contributing/checklists.rst +++ b/docs/contributing/checklists.rst @@ -43,8 +43,8 @@ This checklist is to be kept in sync with the checklist in the pull request temp When merging a PR, do the following: -* |X| Make sure the PR passes tests. -* |X| Make sure the PR has been reviewed **since its last modification**. If not, review it. +* |X| Make sure the PR passed tests, including the Gitlab tests, for the most recent commit in its branch. +* |X| Make sure the PR has been reviewed. If not, review it. If it has been reviewed and any requested changes seem to have been addressed, proceed. * |X| Merge with the Github "Squash and merge" feature. * |X| If there are multiple authors' commits, add `Co-authored-by`_ to give credit to all contributing authors. .. _Co-authored-by: https://github.blog/2018-01-29-commit-together-with-co-authors/