Commit 3aa35a91 authored by Chris Cheshire's avatar Chris Cheshire
Browse files

Merge branch 'chris-feat' into dev

parents f169fea0 fbd26a86
Loading
Loading
Loading
Loading
+0 −1
Original line number Diff line number Diff line

name: Bug report
description: Report something that is broken or incorrect
labels: bug
+1 −1
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ Learn more about contributing: [CONTRIBUTING.md](https://github.com/nf-core/cuta
    - [ ] If you've added a new tool - have you followed the pipeline conventions in the [contribution docs](https://github.com/nf-core/cutandrun/tree/master/.github/CONTRIBUTING.md)
    - [ ] If necessary, also make a PR on the nf-core/cutandrun _branch_ on the [nf-core/test-datasets](https://github.com/nf-core/test-datasets) repository.
- [ ] Make sure your code lints (`nf-core lint`).
- [ ] Ensure the test suite passes (`nextflow run . -profile test,docker`).
- [ ] Ensure the test suite passes (`nextflow run . -profile test,docker` --outdir <OUTDIR>`).
- [ ] Usage Documentation in `docs/usage.md` is updated.
- [ ] Output Documentation in `docs/output.md` is updated.
- [ ] `CHANGELOG.md` is updated.
+7 −2
Original line number Diff line number Diff line
@@ -14,7 +14,10 @@ jobs:
    runs-on: ubuntu-latest
    steps:
      - name: Launch workflow via tower
        uses: nf-core/tower-action@v2
        uses: nf-core/tower-action@v3
        # TODO nf-core: You can customise AWS full pipeline tests as required
        # Add full size test data (but still relatively small datasets for few samples)
        # on the `test_full.config` test runs with only one set of parameters
        
        with:
          workspace_id: ${{ secrets.TOWER_WORKSPACE_ID }}
@@ -28,4 +31,6 @@ jobs:
              "outdir": "s3://${{ secrets.AWS_S3_BUCKET }}/cutandrun/results-${{ github.sha }}"
            }
          profiles: test_full,aws_tower
          pre_run_script: 'export NXF_VER=21.10.3'
          nextflow_config: |
            process.errorStrategy = 'retry'
            process.maxRetries = 3
+4 −2
Original line number Diff line number Diff line
@@ -11,7 +11,7 @@ jobs:
    runs-on: ubuntu-latest
    steps:
      - name: Launch workflow via tower
        uses: nf-core/tower-action@v2
        uses: nf-core/tower-action@v3
        
        with:
          workspace_id: ${{ secrets.TOWER_WORKSPACE_ID }}
@@ -25,4 +25,6 @@ jobs:
              "outdir": "s3://${{ secrets.AWS_S3_BUCKET }}/cutandrun/results-test-${{ github.sha }}"
            }
          profiles: test,aws_tower
          pre_run_script: 'export NXF_VER=21.10.3'
          nextflow_config: |
            process.errorStrategy = 'retry'
            process.maxRetries = 3
+12 −16
Original line number Diff line number Diff line
@@ -12,9 +12,7 @@ jobs:
    runs-on: ubuntu-latest
    steps:
      - uses: actions/checkout@v2
      - uses: actions/setup-node@v1
        with:
          node-version: '10'
      - uses: actions/setup-node@v2
      - name: Install markdownlint
        run: npm install -g markdownlint-cli
      - name: Run Markdownlint
@@ -51,9 +49,7 @@ jobs:
    steps:
      - uses: actions/checkout@v2

      - uses: actions/setup-node@v1
        with:
          node-version: '10'
      - uses: actions/setup-node@v2

      - name: Install editorconfig-checker
        run: npm install -g editorconfig-checker
@@ -64,14 +60,13 @@ jobs:
  YAML:
    runs-on: ubuntu-latest
    steps:
      - uses: actions/checkout@v1
      - uses: actions/setup-node@v1
      - name: Checkout
        uses: actions/checkout@master
      - name: 'Yamllint'
        uses: karancode/yamllint-github-action@master
        with:
          node-version: '10'
      - name: Install yaml-lint
        run: npm install -g yaml-lint
      - name: Run yaml-lint
        run: yamllint $(find ${GITHUB_WORKSPACE} -type f -name "*.yml" -o -name "*.yaml")
          yamllint_file_or_dir: '.'
          yamllint_config_filepath: '.yamllint.yml'

      # If the above check failed, post a comment on the PR explaining the failure
      - name: Post PR comment
@@ -84,10 +79,11 @@ jobs:
            To keep the code consistent with lots of contributors, we run automated code consistency checks.
            To fix this CI test, please run:

            * Install `yaml-lint`
                * [Install `npm`](https://www.npmjs.com/get-npm) then [install `yaml-lint`](https://www.npmjs.com/package/yaml-lint) (`npm install -g yaml-lint`)
            * Install `yamllint`
                * Install `yamllint` following [this](https://yamllint.readthedocs.io/en/stable/quickstart.html#installing-yamllint)
                instructions or alternative install it in your [conda environment](https://anaconda.org/conda-forge/yamllint)
            * Fix the markdown errors
                * Run the test locally: `yamllint $(find . -type f -name "*.yml" -o -name "*.yaml")`
                * Run the test locally: `yamllint $(find . -type f -name "*.yml" -o -name "*.yaml") -c ./.yamllint.yml`
                * Fix any reported errors in your YAML files

            Once you push these changes the test should pass, and you can hide this comment :+1:
Loading