From 39972850e9f89df90e957720db39a9dbcbf28187 Mon Sep 17 00:00:00 2001 From: James Fellows Yates Date: Wed, 9 Dec 2020 10:35:09 +0100 Subject: [PATCH] Fixed dockerhub error and fixed damgaard error --- .github/workflows/ci.yml | 31 ------------------------------- CHANGELOG.md | 13 +++++++++++++ README.md | 1 + 3 files changed, 14 insertions(+), 31 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 1f780dd2f..9a004f3d3 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -186,34 +186,3 @@ jobs: - name: MTNUCRATIO Run basic pipeline with bam input profile, but don't convert BAM, skip everything but nmtnucratio run: | nextflow run ${GITHUB_WORKSPACE} -profile test_tsv_humanbam,docker --skip_fastqc --skip_adapterremoval --skip_deduplication --skip_qualimap --skip_preseq --skip_damage_calculation --run_mtnucratio - - push_dockerhub: - name: Push new Docker image to Docker Hub - runs-on: ubuntu-latest - # Only run if the tests passed - needs: test - # Only run for the nf-core repo, for releases and merged PRs - if: ${{ github.repository == 'nf-core/eager' && (github.event_name == 'release' || github.event_name == 'push') }} - env: - DOCKERHUB_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }} - DOCKERHUB_PASS: ${{ secrets.DOCKERHUB_PASS }} - steps: - - name: Check out pipeline code - uses: actions/checkout@v2 - - - name: Build new docker image - run: docker build --no-cache . -t nfcore/eager:latest - - - name: Push Docker image to DockerHub (dev) - if: ${{ github.event_name == 'push' }} - run: | - echo "$DOCKERHUB_PASS" | docker login -u "$DOCKERHUB_USERNAME" --password-stdin - docker tag nfcore/eager:latest nfcore/eager:dev - docker push nfcore/eager:dev - - name: Push Docker image to DockerHub (release) - if: ${{ github.event_name == 'release' }} - run: | - echo "$DOCKERHUB_PASS" | docker login -u "$DOCKERHUB_USERNAME" --password-stdin - docker push nfcore/eager:latest - docker tag nfcore/eager:latest nfcore/eager:${{ github.ref }} - docker push nfcore/eager:${{ github.ref }} diff --git a/CHANGELOG.md b/CHANGELOG.md index 39aba1bc7..7c62089da 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,19 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html). +## [dev] - Unreleased + +### `Added` + +### `Fixed` + +- Removed leftover old DockerHub push CI commands. +- [#627](https://github.com/nf-core/eager/issues/627) Added de Barros Damgaard citation to README + +### `Dependencies` + +### `Deprecated` + ## [2.2.2] - 2020-12-09 ### `Added` diff --git a/README.md b/README.md index 0a9675aed..a85b30644 100644 --- a/README.md +++ b/README.md @@ -244,3 +244,4 @@ This repository uses test data from the following studies: * Fellows Yates, J. A. et al. (2017) ‘Central European Woolly Mammoth Population Dynamics: Insights from Late Pleistocene Mitochondrial Genomes’, Scientific reports, 7(1), p. 17714. [doi: 10.1038/s41598-017-17723-1](https://doi.org/10.1038/s41598-017-17723-1). * Gamba, C. et al. (2014) ‘Genome flux and stasis in a five millennium transect of European prehistory’, Nature communications, 5, p. 5257. [doi: 10.1038/ncomms6257](https://doi.org/10.1038/ncomms6257). * Star, B. et al. (2017) ‘Ancient DNA reveals the Arctic origin of Viking Age cod from Haithabu, Germany’, Proceedings of the National Academy of Sciences of the United States of America, 114(34), pp. 9152–9157. [doi: 10.1073/pnas.1710186114](https://doi.org/10.1073/pnas.1710186114). +* de Barros Damgaard, P. et al. (2018). '137 ancient human genomes from across the Eurasian steppes.', Nature, 557(7705), 369–374. [doi: 10.1038/s41586-018-0094-2](https://doi.org/10.1038/s41586-018-0094-2)