diff --git a/.github/workflows/branch.yml b/.github/workflows/branch.yml index 1342a9d7b3..855201d049 100644 --- a/.github/workflows/branch.yml +++ b/.github/workflows/branch.yml @@ -13,4 +13,4 @@ jobs: - uses: actions/checkout@v1 - name: Check PRs run: | - { [[ $(git remote get-url origin) == *nf-core/sarek ]] && [[ ${GITHUB_HEAD_REF} = "dev" ]]; } || [[ ${GITHUB_HEAD_REF} == "patch" ]] \ No newline at end of file + { [[ $(git remote get-url origin) == *nf-core/sarek ]] && [[ ${GITHUB_HEAD_REF} = "dev" ]]; } || [[ ${GITHUB_HEAD_REF} == "patch" ]] diff --git a/.travis.yml b/.travis.yml index 1ee0bf40db..e4f4c29ff2 100644 --- a/.travis.yml +++ b/.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_BRANCH = "patch" ]))' + - '[ $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/sarek:dev # Fake the tag locally so that the pipeline runs properly diff --git a/CHANGELOG.md b/CHANGELOG.md index 1a6bfcaf79..7f0dcf5edf 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -62,6 +62,16 @@ Jåkkåtjkaskajekna is one of the two glaciers of the Ålkatj Massif. - [#49](https://github.com/nf-core/sarek/issues/49) - Use correct tag for annotation containers. - [#50](https://github.com/nf-core/sarek/issues/50) - Fix paths for scripts. +## [2.5.1] - Årjep-Ålkatjjekna + +Årjep-Ålkatjjekna is one of the two glaciers of the Ålkatj Massif. + +### `Fixed` + +- [#48](https://github.com/nf-core/sarek/issues/48) - Fix `singularity.autoMounts` issue. +- [#49](https://github.com/nf-core/sarek/issues/49) - Use correct tag for annotation containers. +- [#50](https://github.com/nf-core/sarek/issues/50) - Fix paths for scripts. + ## [2.5] - Ålkatj Ålkatj is one of the main massif in the Sarek National Park. diff --git a/README.md b/README.md index 83b42c68ff..f2528f51e3 100644 --- a/README.md +++ b/README.md @@ -90,7 +90,7 @@ For further information or help, don't hesitate to get in touch on [Slack](https ## Aknowledgements -[![Barntumörbanken](docs/images/BTB_logo.png)](https://ki.se/forskning/barntumorbanken-0) | [![SciLifeLab](docs/images/SciLifeLab_logo.png)](https://scilifelab.se) +[![Barntumörbanken](docs/images/BTB_logo.png)](https://ki.se/forskning/barntumorbanken) | [![SciLifeLab](docs/images/SciLifeLab_logo.png)](https://scilifelab.se) :-:|:-: [![National Genomics Infrastructure](docs/images/NGI_logo.png)](https://ngisweden.scilifelab.se/) | [![National Bioinformatics Infrastructure Sweden](docs/images/NBIS_logo.png)](https://nbis.se)