From 252beed1e7facffa18de224dbd4686a61cadf753 Mon Sep 17 00:00:00 2001 From: Maxime U Garcia Date: Wed, 10 Jul 2024 11:13:29 +0200 Subject: [PATCH 1/4] Update first_release.md --- .../docs/tutorials/adding_a_pipeline/first_release.md | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sites/docs/src/content/docs/tutorials/adding_a_pipeline/first_release.md b/sites/docs/src/content/docs/tutorials/adding_a_pipeline/first_release.md index 82c8bb20c9..63f2588de2 100644 --- a/sites/docs/src/content/docs/tutorials/adding_a_pipeline/first_release.md +++ b/sites/docs/src/content/docs/tutorials/adding_a_pipeline/first_release.md @@ -37,7 +37,10 @@ Not to worry, we're a friendly bunch. To get your pipeline reviewed for its initial release, do the following: -1. Make a pull-request from the `dev` branch to `master` on the nf-core fork. This is a +1. Create a new branch based on `TEMPLATE`, called `TEMPLATE_` from the latest tools sync that was merged in `dev`. + The commit message from @nf-core-bot will help you figure what was the tools versions used. + +3. Make a pull-request from the `dev` branch to this `TEMPLATE_` branch on the nf-core fork. This is a special case and all of the tests should pass. 1. Once the tests are passing, request a review from the core team. You can use the From 558272b1236bb2974891d182d540dd1dcd18ffe4 Mon Sep 17 00:00:00 2001 From: Maxime U Garcia Date: Wed, 10 Jul 2024 11:33:12 +0200 Subject: [PATCH 2/4] Update first_release.md --- .../content/docs/tutorials/adding_a_pipeline/first_release.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sites/docs/src/content/docs/tutorials/adding_a_pipeline/first_release.md b/sites/docs/src/content/docs/tutorials/adding_a_pipeline/first_release.md index 63f2588de2..2cd8387683 100644 --- a/sites/docs/src/content/docs/tutorials/adding_a_pipeline/first_release.md +++ b/sites/docs/src/content/docs/tutorials/adding_a_pipeline/first_release.md @@ -39,6 +39,8 @@ To get your pipeline reviewed for its initial release, do the following: 1. Create a new branch based on `TEMPLATE`, called `TEMPLATE_` from the latest tools sync that was merged in `dev`. The commit message from @nf-core-bot will help you figure what was the tools versions used. + For example, if this commit message `Template update for nf-core/tools version 1.13` is the one that used for a tools sync, + the branch should be called `TEMPLATE_1.13`. 3. Make a pull-request from the `dev` branch to this `TEMPLATE_` branch on the nf-core fork. This is a special case and all of the tests should pass. From dcc262a68687c81727f134d7b14f69a9cb084ee4 Mon Sep 17 00:00:00 2001 From: nf-core-bot Date: Wed, 10 Jul 2024 09:34:53 +0000 Subject: [PATCH 3/4] [automated] Fix code linting --- .../content/docs/tutorials/adding_a_pipeline/first_release.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sites/docs/src/content/docs/tutorials/adding_a_pipeline/first_release.md b/sites/docs/src/content/docs/tutorials/adding_a_pipeline/first_release.md index 2cd8387683..0af995022f 100644 --- a/sites/docs/src/content/docs/tutorials/adding_a_pipeline/first_release.md +++ b/sites/docs/src/content/docs/tutorials/adding_a_pipeline/first_release.md @@ -42,10 +42,10 @@ To get your pipeline reviewed for its initial release, do the following: For example, if this commit message `Template update for nf-core/tools version 1.13` is the one that used for a tools sync, the branch should be called `TEMPLATE_1.13`. -3. Make a pull-request from the `dev` branch to this `TEMPLATE_` branch on the nf-core fork. This is a +2. Make a pull-request from the `dev` branch to this `TEMPLATE_` branch on the nf-core fork. This is a special case and all of the tests should pass. -1. Once the tests are passing, request a review from the core team. You can use the +3. Once the tests are passing, request a review from the core team. You can use the [#request-review](https://app.slack.com/client/TE6CZUZPH/CQY2U5QU9) slack channel for this. What happens next depends on the state of your master branch: From a7ae9923cbc097d7f8e25ad55ffc91f72c297365 Mon Sep 17 00:00:00 2001 From: Maxime U Garcia Date: Wed, 10 Jul 2024 14:05:52 +0200 Subject: [PATCH 4/4] Update sites/docs/src/content/docs/tutorials/adding_a_pipeline/first_release.md Co-authored-by: James A. Fellows Yates --- .../content/docs/tutorials/adding_a_pipeline/first_release.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sites/docs/src/content/docs/tutorials/adding_a_pipeline/first_release.md b/sites/docs/src/content/docs/tutorials/adding_a_pipeline/first_release.md index 0af995022f..58d1923bd2 100644 --- a/sites/docs/src/content/docs/tutorials/adding_a_pipeline/first_release.md +++ b/sites/docs/src/content/docs/tutorials/adding_a_pipeline/first_release.md @@ -37,7 +37,7 @@ Not to worry, we're a friendly bunch. To get your pipeline reviewed for its initial release, do the following: -1. Create a new branch based on `TEMPLATE`, called `TEMPLATE_` from the latest tools sync that was merged in `dev`. +1. Create a new branch based on `TEMPLATE`, called `TEMPLATE_` from the version of the TEMPLATE (i.e., latest tools sync) that is in the `dev` branch you wish merge into `master`. The commit message from @nf-core-bot will help you figure what was the tools versions used. For example, if this commit message `Template update for nf-core/tools version 1.13` is the one that used for a tools sync, the branch should be called `TEMPLATE_1.13`.