Merge pull request #392 from nf-core/check-patch-travis-ci

Add Patch to enable PRs coming from patch branch
nf-core · Sep 24, 2019 · b7d34e1 · b7d34e1
2 parents 6d7eaf1 + 4271ca3
commit b7d34e1
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 7 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -11,6 +11,7 @@
 * The tools `create` command now sets up a `TEMPLATE` and a `dev` branch for syncing
 * Fixed issue [379](https://github.com/nf-core/tools/issues/379)
 * nf-core launch now uses stable parameter schema version 0.1.0
+* Check that PR from patch or dev branch is acceptable by linting
 
 ### Syncing
 
@@ -25,6 +26,7 @@
 
 ### Template
 
+* Add new code for Travis CI to allow PRs from patch branches too
 * Fix small typo in central readme of tools for future releases
 * Small code polishing + typo fix in the template main.nf file
 * Switched to yaml.safe_load() to fix PyYAML warning that was thrown because of a possible [exploit](https://github.com/yaml/pyyaml/wiki/PyYAML-yaml.load(input)-Deprecation)

diff --git a/docs/lint_errors.md b/docs/lint_errors.md
@@ -127,7 +127,7 @@ This test fails if the following happens:
 
     ```yaml
     before_install:
-      - '[ $TRAVIS_PULL_REQUEST = "false" ] || [ $TRAVIS_BRANCH != "master" ] || ([ $TRAVIS_PULL_REQUEST_SLUG = $TRAVIS_REPO_SLUG ] && [ $TRAVIS_PULL_REQUEST_BRANCH = "dev" ])'
+      - '[ $TRAVIS_PULL_REQUEST = "false" ] || [ $TRAVIS_BRANCH != "master" ] || ([ $TRAVIS_PULL_REQUEST_SLUG = $TRAVIS_REPO_SLUG ] && ([ $TRAVIS_PULL_REQUEST_BRANCH = "dev" ] || [ $TRAVIS_PULL_REQUEST_BRANCH = "patch" ]))'
     ```
 
 ## Error #6 - Repository `README.md` tests ## {#6}

diff --git a/nf_core/lint.py b/nf_core/lint.py
@@ -454,14 +454,14 @@ def check_ci_config(self):
             if os.path.isfile(fn):
                 with open(fn, 'r') as fh:
                     ciconf = yaml.safe_load(fh)
-                # Check that we have the master branch protection
-                travisMasterCheck = '[ $TRAVIS_PULL_REQUEST = "false" ] || [ $TRAVIS_BRANCH != "master" ] || ([ $TRAVIS_PULL_REQUEST_SLUG = $TRAVIS_REPO_SLUG ] && [ $TRAVIS_PULL_REQUEST_BRANCH = "dev" ])'
+                # Check that we have the master branch protection, but allow patch as well
+                travisMasterCheck = '[ $TRAVIS_PULL_REQUEST = "false" ] || [ $TRAVIS_BRANCH != "master" ] || ([ $TRAVIS_PULL_REQUEST_SLUG = $TRAVIS_REPO_SLUG ] && ([ $TRAVIS_PULL_REQUEST_BRANCH = "dev" ] || [ $TRAVIS_PULL_REQUEST_BRANCH = "patch" ]))'
                 try:
                     assert(travisMasterCheck in ciconf.get('before_install', {}))
                 except AssertionError:
-                    self.failed.append((5, "Continuous integration must check for master branch PRs: '{}'".format(fn)))
+                    self.failed.append((5, "Continuous integration must check for master/patch branch PRs: '{}'".format(fn)))
                 else:
-                    self.passed.append((5, "Continuous integration checks for master branch PRs: '{}'".format(fn)))
+                    self.passed.append((5, "Continuous integration checks for master/patch branch PRs: '{}'".format(fn)))
                 # Check that the nf-core linting runs
                 try:
                     assert('nf-core lint ${TRAVIS_BUILD_DIR}' in ciconf['script'])

diff --git a/nf_core/pipeline-template/{{cookiecutter.name_noslash}}/.travis.yml b/nf_core/pipeline-template/{{cookiecutter.name_noslash}}/.travis.yml
@@ -9,7 +9,7 @@ matrix:
 
 before_install:
   # PRs to master are only ok if coming from dev branch
-  - '[ $TRAVIS_PULL_REQUEST = "false" ] || [ $TRAVIS_BRANCH != "master" ] || ([ $TRAVIS_PULL_REQUEST_SLUG = $TRAVIS_REPO_SLUG ] && [ $TRAVIS_PULL_REQUEST_BRANCH = "dev" ])'
+  - '[ $TRAVIS_PULL_REQUEST = "false" ] || [ $TRAVIS_BRANCH != "master" ] || ([ $TRAVIS_PULL_REQUEST_SLUG = $TRAVIS_REPO_SLUG ] && ([ $TRAVIS_PULL_REQUEST_BRANCH = "dev" ] || [ $TRAVIS_PULL_REQUEST_BRANCH = "patch" ]))'
   # Pull the docker image first so the test doesn't wait for this
   - docker pull {{ cookiecutter.name_docker }}:dev
   # Fake the tag locally so that the pipeline runs properly

diff --git a/tests/lint_examples/minimal_working_example/.travis.yml b/tests/lint_examples/minimal_working_example/.travis.yml
@@ -11,7 +11,7 @@ matrix:
 
 before_install:
   # PRs to master are only ok if coming from dev branch
-  - '[ $TRAVIS_PULL_REQUEST = "false" ] || [ $TRAVIS_BRANCH != "master" ] || ([ $TRAVIS_PULL_REQUEST_SLUG = $TRAVIS_REPO_SLUG ] && [ $TRAVIS_PULL_REQUEST_BRANCH = "dev" ])'
+  - '[ $TRAVIS_PULL_REQUEST = "false" ] || [ $TRAVIS_BRANCH != "master" ] || ([ $TRAVIS_PULL_REQUEST_SLUG = $TRAVIS_REPO_SLUG ] && ([ $TRAVIS_PULL_REQUEST_BRANCH = "dev" ] || [ $TRAVIS_PULL_REQUEST_BRANCH = "patch" ]))'
   # Pull the docker image first so the test doesn't wait for this
   - docker pull nfcore/tools:dev
   # Fake the tag locally so that the pipeline runs properly