Skip to content
Permalink

Comparing changes

This is a direct comparison between two commits made in this repository or its related repositories. View the default comparison for this range or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: nf-core/tools
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 32ff872e4236ef35d86842901fddbb1d780add4f
Choose a base ref
..
head repository: nf-core/tools
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: fb5211a6b274bb0d75d159aa7f6b439787f47067
Choose a head ref
Showing with 24 additions and 17 deletions.
  1. +10 −7 .github/workflows/create-lint-wf.yml
  2. +7 −5 .github/workflows/lint-code.yml
  3. +7 −5 nf_core/pipeline-template/.github/workflows/linting.yml
17 changes: 10 additions & 7 deletions .github/workflows/create-lint-wf.yml
Original file line number Diff line number Diff line change
@@ -47,6 +47,12 @@ jobs:
wget -qO- get.nextflow.io | bash
sudo mv nextflow /usr/local/bin/
# Install the Prettier linting stuff
- uses: actions/setup-node@v2

- name: Install Prettier
run: npm install -g prettier

# Build a pipeline from the template
- name: nf-core create
run: nf-core --log-file log.txt create -n testpipeline -d "This pipeline is for testing" -a "Testing McTestface"
@@ -55,14 +61,11 @@ jobs:
- name: nf-core modules create
run: nf-core --log-file log.txt modules create bpipe --dir nf-core-testpipeline --author @nf-core-bot --label process_low --meta

# Run code formatting checks
- name: Check code with Prettier
uses: creyD/prettier_action@v4.2
with:
dry: true
prettier_options: --check
# Run code style linters
- name: Run Prettier --check
run: prettier --check nf-core-testpipeline

- name: Check code Black
- name: Check code lints with Black
uses: psf/black@stable
with:
src: "./nf-core-testpipeline"
12 changes: 7 additions & 5 deletions .github/workflows/lint-code.yml
Original file line number Diff line number Diff line change
@@ -7,11 +7,13 @@ jobs:
steps:
- uses: actions/checkout@v2

- name: Check with Prettier
uses: creyD/prettier_action@v4.2
with:
dry: true
prettier_options: --check
- uses: actions/setup-node@v2

- name: Install Prettier
run: npm install -g prettier

- name: Run Prettier --check
run: prettier --check ${GITHUB_WORKSPACE}

PythonBlack:
runs-on: ubuntu-latest
12 changes: 7 additions & 5 deletions nf_core/pipeline-template/.github/workflows/linting.yml
Original file line number Diff line number Diff line change
@@ -27,11 +27,13 @@ jobs:
steps:
- uses: actions/checkout@v2

- name: Check with Prettier
uses: creyD/prettier_action@v4.2
with:
dry: true
prettier_options: --check
- uses: actions/setup-node@v2

- name: Install Prettier
run: npm install -g prettier

- name: Run Prettier --check
run: prettier --check ${GITHUB_WORKSPACE}

nf-core:
runs-on: ubuntu-latest