From 6f500dbf31f1850bc35b1f28d138631f85bc2b21 Mon Sep 17 00:00:00 2001 From: Edmund Miller Date: Mon, 18 Nov 2024 10:27:19 -0600 Subject: [PATCH 1/2] ci: Test 24.10.1 Because of https://github.com/nf-core/modules/issues/6664 it's a little critical --- .github/workflows/example.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/example.yml b/.github/workflows/example.yml index f540adf..82c477c 100644 --- a/.github/workflows/example.yml +++ b/.github/workflows/example.yml @@ -20,6 +20,7 @@ jobs: - "21.10.3" - "22.04" - "22.03.1-edge" + - "24.10.1" - "latest" - "latest-stable" - "latest-edge" From e5529f49776d11a6dbc30919ed0f565b908e1bdc Mon Sep 17 00:00:00 2001 From: Edmund Miller Date: Mon, 18 Nov 2024 10:30:26 -0600 Subject: [PATCH 2/2] ci: Run CI on renovate to automerge branches --- .github/renovate.json5 | 3 ++- .github/workflows/example.yml | 2 ++ .github/workflows/test.yml | 2 ++ 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/.github/renovate.json5 b/.github/renovate.json5 index 332265e..d094a7f 100644 --- a/.github/renovate.json5 +++ b/.github/renovate.json5 @@ -3,7 +3,8 @@ "extends": [ "github>nf-core/ops//.github/renovate/default.json5", "config:recommended", - "schedule:weekly" + "schedule:weekly", + ":automergeBranch" ], "packageRules": [ { diff --git a/.github/workflows/example.yml b/.github/workflows/example.yml index 82c477c..e026cb6 100644 --- a/.github/workflows/example.yml +++ b/.github/workflows/example.yml @@ -4,6 +4,8 @@ on: push: branches: - master + # https://docs.renovatebot.com/key-concepts/automerge/#branch-vs-pr-automerging + - "renovate/**" # branches Renovate creates pull_request: workflow_dispatch: release: diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index ad2c497..0a0551d 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -4,6 +4,8 @@ on: push: branches: - master + # https://docs.renovatebot.com/key-concepts/automerge/#branch-vs-pr-automerging + - "renovate/**" # branches Renovate creates pull_request: workflow_dispatch: release: