From 6488f93845b0b82d518392e6ca7600cf13aec2f9 Mon Sep 17 00:00:00 2001 From: Phil Ewels Date: Thu, 20 Feb 2020 17:07:21 +0100 Subject: [PATCH 1/5] Version bump to v1.10dev Also added in a git config step for the sync. See nf-core/tools#548 --- .github/workflows/sync.yml | 5 +++++ CHANGELOG.md | 4 ++++ setup.py | 2 +- 3 files changed, 10 insertions(+), 1 deletion(-) diff --git a/.github/workflows/sync.yml b/.github/workflows/sync.yml index c395c9c4f0..9f7c01a8da 100644 --- a/.github/workflows/sync.yml +++ b/.github/workflows/sync.yml @@ -29,6 +29,11 @@ jobs: wget -qO- get.nextflow.io | bash sudo ln -s /tmp/nextflow/nextflow /usr/local/bin/nextflow + - name: Configure git + run: | + git config user.email "core@nf-co.re" + git config user.name "nf-core-bot" + - name: Run synchronisation if: github.repository == 'nf-core/tools' env: diff --git a/CHANGELOG.md b/CHANGELOG.md index 5ce251bddc..619db1aca3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,9 @@ # nf-core/tools: Changelog +## v1.10dev + +_..nothing yet.._ + ## v1.9 ### Continuous integration diff --git a/setup.py b/setup.py index 54bfb7e1a8..3aa7a19b3a 100644 --- a/setup.py +++ b/setup.py @@ -3,7 +3,7 @@ from setuptools import setup, find_packages import sys -version = '1.9' +version = '1.10dev' with open('README.md') as f: readme = f.read() From d5d1d3cb0ec5416f05cf97e0caf306c5131db402 Mon Sep 17 00:00:00 2001 From: Phil Ewels Date: Thu, 20 Feb 2020 17:30:53 +0100 Subject: [PATCH 2/5] Add PR branch check to tools repo --- .github/workflows/branch.yml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 .github/workflows/branch.yml diff --git a/.github/workflows/branch.yml b/.github/workflows/branch.yml new file mode 100644 index 0000000000..f1e5aef523 --- /dev/null +++ b/.github/workflows/branch.yml @@ -0,0 +1,16 @@ +name: nf-core branch protection +# This workflow is triggered on PRs to master branch on the repository +# It fails when someone tries to make a PR against the nf-core `master` branch instead of `dev` +on: + pull_request: + branches: + - master + +jobs: + test: + runs-on: ubuntu-18.04 + steps: + # PRs are only ok if coming from an nf-core `dev` branch or a fork `patch` branch + - name: Check PRs + run: | + { [[ $(git remote get-url origin) == *nf-core/tools ]] && [[ ${GITHUB_HEAD_REF} = "dev" ]]; } || [[ ${GITHUB_HEAD_REF} == "patch" ]] From 5192b6df3f4ad389b0a495edf88b62949b6f0ccf Mon Sep 17 00:00:00 2001 From: Phil Ewels Date: Thu, 20 Feb 2020 17:32:28 +0100 Subject: [PATCH 3/5] changelog --- CHANGELOG.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 619db1aca3..85665a055e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,7 +2,9 @@ ## v1.10dev -_..nothing yet.._ +### Other + +* Added CI test to check for PRs against `master` in tools repo ## v1.9 From f9d50dbc053c3dfb0cf751cac248e43483c4eea2 Mon Sep 17 00:00:00 2001 From: Phil Ewels Date: Thu, 20 Feb 2020 17:43:03 +0100 Subject: [PATCH 4/5] Tart up the readme badges a little --- CHANGELOG.md | 4 +++- README.md | 5 +++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 619db1aca3..85665a055e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,7 +2,9 @@ ## v1.10dev -_..nothing yet.._ +### Other + +* Added CI test to check for PRs against `master` in tools repo ## v1.9 diff --git a/README.md b/README.md index 3c519f17cf..a7f44b8329 100644 --- a/README.md +++ b/README.md @@ -1,8 +1,9 @@ # ![nf-core/tools](docs/images/nfcore-tools_logo.png) -[![GitHub Actions CI Status](https://github.com/nf-core/tools/workflows/CI%20tests/badge.svg)](https://github.com/nf-core/tools/actions) +[![Python tests](https://github.com/nf-core/tools/workflows/Python%20tests/badge.svg?branch=master&event=push)](https://github.com/nf-core/tools/actions?query=workflow%3A%22Python+tests%22+branch%3Amaster) [![codecov](https://codecov.io/gh/nf-core/tools/branch/master/graph/badge.svg)](https://codecov.io/gh/nf-core/tools) -[![install with bioconda](https://img.shields.io/badge/install%20with-bioconda-brightgreen.svg?style=flat-square)](http://bioconda.github.io/recipes/nf-core/README.html) +[![install with bioconda](https://img.shields.io/badge/install%20with-bioconda-brightgreen.svg)](http://bioconda.github.io/recipes/nf-core/README.html) +[![install with PyPI](https://img.shields.io/badge/install%20with-PyPI-blue.svg)](https://pypi.org/project/nf-core/) A python package with helper tools for the nf-core community. From 4cd436d70acb78492bf8ec3ca9bcdecc9b7d9e9c Mon Sep 17 00:00:00 2001 From: Harshil Patel Date: Thu, 20 Feb 2020 17:06:00 +0000 Subject: [PATCH 5/5] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index a7f44b8329..ae9bb2ed48 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ [![Python tests](https://github.com/nf-core/tools/workflows/Python%20tests/badge.svg?branch=master&event=push)](https://github.com/nf-core/tools/actions?query=workflow%3A%22Python+tests%22+branch%3Amaster) [![codecov](https://codecov.io/gh/nf-core/tools/branch/master/graph/badge.svg)](https://codecov.io/gh/nf-core/tools) -[![install with bioconda](https://img.shields.io/badge/install%20with-bioconda-brightgreen.svg)](http://bioconda.github.io/recipes/nf-core/README.html) +[![install with Bioconda](https://img.shields.io/badge/install%20with-bioconda-brightgreen.svg)](http://bioconda.github.io/recipes/nf-core/README.html) [![install with PyPI](https://img.shields.io/badge/install%20with-PyPI-blue.svg)](https://pypi.org/project/nf-core/) A python package with helper tools for the nf-core community.