-
Notifications
You must be signed in to change notification settings - Fork 190
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #1066 from nf-core/dev
`dev` -> `master` for v1.14 release
- Loading branch information
Showing
85 changed files
with
1,932 additions
and
1,136 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,32 @@ | ||
| name: nf-core Docker push (dev) | ||
| # This builds the docker image and pushes it to DockerHub | ||
| # Runs on nf-core repo releases and push event to 'dev' branch (PR merges) | ||
| on: | ||
| push: | ||
| branches: | ||
| - dev | ||
|
|
||
| jobs: | ||
| push_dockerhub: | ||
| name: Push new Docker image to Docker Hub (dev) | ||
| runs-on: ubuntu-latest | ||
| # Only run for the nf-core repo, for releases and merged PRs | ||
| if: ${{ github.repository == 'nf-core/tools'}} | ||
| env: | ||
| DOCKERHUB_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }} | ||
| DOCKERHUB_PASS: ${{ secrets.DOCKERHUB_PASS }} | ||
| strategy: | ||
| matrix: | ||
| image: [base, tools] | ||
| steps: | ||
| - name: Check out tools code | ||
| uses: actions/checkout@v2 | ||
|
|
||
| - name: Build new docker image | ||
| run: docker build --no-cache . -t nfcore/${{ matrix.image }}:dev -f ${{ matrix.image }}.Dockerfile | ||
|
|
||
| - name: Push Docker image to DockerHub (dev) | ||
| run: | | ||
| echo "$DOCKERHUB_PASS" | docker login -u "$DOCKERHUB_USERNAME" --password-stdin | ||
| docker push nfcore/${{ matrix.image }}:dev | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,32 @@ | ||
| name: nf-core Docker push (release) | ||
| # This builds the docker image and pushes it to DockerHub | ||
| # Runs on nf-core repo releases and push event to 'dev' branch (PR merges) | ||
| on: | ||
| release: | ||
| types: [published] | ||
|
|
||
| jobs: | ||
| push_dockerhub: | ||
| name: Push new Docker image to Docker Hub (release) | ||
| runs-on: ubuntu-latest | ||
| # Only run for the nf-core repo, for releases and merged PRs | ||
| if: ${{ github.repository == 'nf-core/tools' }} | ||
| env: | ||
| DOCKERHUB_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }} | ||
| DOCKERHUB_PASS: ${{ secrets.DOCKERHUB_PASS }} | ||
| strategy: | ||
| matrix: | ||
| image: [base, tools] | ||
| steps: | ||
| - name: Check out code | ||
| uses: actions/checkout@v2 | ||
|
|
||
| - name: Build new docker image | ||
| run: docker build --no-cache . -t nfcore/${{ matrix.image }}:latest -f ${{ matrix.image }}.Dockerfile | ||
|
|
||
| - name: Push Docker image to DockerHub (release) | ||
| run: | | ||
| echo "$DOCKERHUB_PASS" | docker login -u "$DOCKERHUB_USERNAME" --password-stdin | ||
| docker push nfcore/${{ matrix.image }}:latest | ||
| docker tag nfcore/${{ matrix.image }}:latest nf-core/${{ matrix.image }}:${{ github.event.release.tag_name }} | ||
| docker push nfcore/${{ matrix.image }}:${{ github.event.release.tag_name }} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,7 +1,7 @@ | ||
| name: nf-core/tools API docs | ||
| name: nf-core/tools dev API docs | ||
| on: | ||
| push: | ||
| branches: [master, dev] | ||
| branches: [dev] | ||
|
|
||
| jobs: | ||
| api-docs: | ||
|
|
@@ -26,18 +26,14 @@ jobs: | |
| - name: Build HTML docs | ||
| run: make --directory ./docs/api html | ||
|
|
||
| - name: Push docs to api-doc branch | ||
| - name: Sync dev docs | ||
| if: github.repository == 'nf-core/tools' | ||
| run: | | ||
| git checkout --orphan api-doc | ||
| git rm -r --cache . | ||
| rm .gitignore | ||
| git config user.email "[email protected]" | ||
| git config user.name "nf-core-bot" | ||
| git add docs | ||
| git commit --message "nf-core/tools docs build | ||
| $GITHUB_REF - $GITHUB_SHA | ||
| " | ||
| git remote add nf-core https://github.com/nf-core/tools.git | ||
| git push --force --set-upstream nf-core api-doc | ||
| uses: SamKirkland/[email protected] | ||
| with: | ||
| server: ${{ secrets.ftp_server }} | ||
| username: ${{ secrets.ftp_username}} | ||
| password: ${{ secrets.ftp_password }} | ||
| local-dir: './docs/api/_build/html/' | ||
| server-dir: ${{ secrets.ftp_server_dir }}/dev/ | ||
| protocol: ${{ secrets.ftp_protocol }} | ||
| port: ${{ secrets.ftp_port }} | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,42 @@ | ||
| name: nf-core/tools release API docs | ||
| on: | ||
| release: | ||
| types: [published] | ||
|
|
||
| jobs: | ||
| api-docs: | ||
| name: Build & push Sphinx API docs | ||
| runs-on: ubuntu-18.04 | ||
| strategy: | ||
| matrix: | ||
| dir: [latest, $GITHUB_REF] | ||
|
|
||
| steps: | ||
| - name: Check out source-code repository | ||
| uses: actions/checkout@v2 | ||
|
|
||
| - name: Set up Python 3.7 | ||
| uses: actions/setup-python@v1 | ||
| with: | ||
| python-version: 3.7 | ||
|
|
||
| - name: Install python dependencies | ||
| run: | | ||
| pip install --upgrade pip | ||
| pip install -r ./docs/api/requirements.txt | ||
| pip install . | ||
| - name: Build HTML docs | ||
| run: make --directory ./docs/api html | ||
|
|
||
| - name: Sync release docs | ||
| if: github.repository == 'nf-core/tools' | ||
| uses: SamKirkland/[email protected] | ||
| with: | ||
| server: ${{ secrets.ftp_server }} | ||
| username: ${{ secrets.ftp_username}} | ||
| password: ${{ secrets.ftp_password }} | ||
| local-dir: './docs/api/_build/html/' | ||
| server-dir: ${{ secrets.ftp_server_dir }}/${{ matrix.dir }}/ | ||
| protocol: ${{ secrets.ftp_protocol }} | ||
| port: ${{ secrets.ftp_port }} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -114,3 +114,4 @@ ENV/ | |
| .idea | ||
| pip-wheel-metadata | ||
| .vscode | ||
| .*.sw? | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.