From 6d7b6543cc7e2e08a9f57384020588f98e390126 Mon Sep 17 00:00:00 2001 From: Edmund Miller Date: Thu, 6 Jun 2024 14:32:00 -0500 Subject: [PATCH 1/2] ci: Run checks on renovate branches to avoid creating and merging PRs --- .github/workflows/create-lint-wf.yml | 2 ++ .github/workflows/create-test-lint-wf-template.yml | 2 ++ .github/workflows/create-test-wf.yml | 2 ++ .github/workflows/lint-code.yml | 2 ++ .github/workflows/pytest.yml | 2 ++ 5 files changed, 10 insertions(+) diff --git a/.github/workflows/create-lint-wf.yml b/.github/workflows/create-lint-wf.yml index fa6c38ef07..0166c966ff 100644 --- a/.github/workflows/create-lint-wf.yml +++ b/.github/workflows/create-lint-wf.yml @@ -3,6 +3,8 @@ on: push: branches: - dev + # https://docs.renovatebot.com/key-concepts/automerge/#branch-vs-pr-automerging + - "renovate/**" # branches Renovate creates paths-ignore: - "docs/**" - "CHANGELOG.md" diff --git a/.github/workflows/create-test-lint-wf-template.yml b/.github/workflows/create-test-lint-wf-template.yml index cabd4b9abe..a69c08ea52 100644 --- a/.github/workflows/create-test-lint-wf-template.yml +++ b/.github/workflows/create-test-lint-wf-template.yml @@ -3,6 +3,8 @@ on: push: branches: - dev + # https://docs.renovatebot.com/key-concepts/automerge/#branch-vs-pr-automerging + - "renovate/**" # branches Renovate creates paths: - nf_core/pipeline-template/** pull_request: diff --git a/.github/workflows/create-test-wf.yml b/.github/workflows/create-test-wf.yml index 53f84b72c4..735cfebc36 100644 --- a/.github/workflows/create-test-wf.yml +++ b/.github/workflows/create-test-wf.yml @@ -3,6 +3,8 @@ on: push: branches: - dev + # https://docs.renovatebot.com/key-concepts/automerge/#branch-vs-pr-automerging + - "renovate/**" # branches Renovate creates paths-ignore: - "docs/**" - "CHANGELOG.md" diff --git a/.github/workflows/lint-code.yml b/.github/workflows/lint-code.yml index 7ffd6e9df9..93de1cc154 100644 --- a/.github/workflows/lint-code.yml +++ b/.github/workflows/lint-code.yml @@ -3,6 +3,8 @@ on: push: branches: - dev + # https://docs.renovatebot.com/key-concepts/automerge/#branch-vs-pr-automerging + - "renovate/**" # branches Renovate creates pull_request: release: types: [published] diff --git a/.github/workflows/pytest.yml b/.github/workflows/pytest.yml index 76d5d710c0..2b655e9393 100644 --- a/.github/workflows/pytest.yml +++ b/.github/workflows/pytest.yml @@ -5,6 +5,8 @@ on: push: branches: - dev + # https://docs.renovatebot.com/key-concepts/automerge/#branch-vs-pr-automerging + - "renovate/**" # branches Renovate creates paths-ignore: - "docs/**" - "CHANGELOG.md" From bf1ee0c3244b2c411743cdb03e3e9970fd250ad0 Mon Sep 17 00:00:00 2001 From: nf-core-bot Date: Thu, 6 Jun 2024 19:36:01 +0000 Subject: [PATCH 2/2] [automated] Update CHANGELOG.md --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 603fa77e24..f3ef7e680d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -69,6 +69,7 @@ - set default_branch to master for now ([#3335](https://github.com/nf-core/tools/issues/3335)) - Set git defaultBranch to master in sync action ([#3337](https://github.com/nf-core/tools/pull/3337)) - Add verbose mode to sync action ([#3339](https://github.com/nf-core/tools/pull/3339)) +- ci: Run checks on renovate branches to avoid creating and merging PRs ([#3018](https://github.com/nf-core/tools/pull/3018)) ### Version updates