make linting workflow reflect what is done locally (Makefile).

This commit is contained in:
fiatjaf 2020-09-02 22:06:53 -03:00
parent dc3d96c6a8
commit 753e9c5b15
4 changed files with 41 additions and 26 deletions

View File

@ -1,25 +1,33 @@
name: Run Linters name: Linters
on: [push, pull_request] on:
push:
branches: [ master ]
pull_request:
branches: [ master ]
jobs: jobs:
mypy: black:
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
- name: Checkout - uses: actions/checkout@v2
uses: actions/checkout@v1 - run: sudo apt-get install python3-venv
- name: Run MyPy python type checker - run: python3 -m venv venv
uses: jpetrucciani/mypy-check@master - run: ./venv/bin/pip install black
with: - run: make checkblack
path: 'lnbits'
prettier: prettier:
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
- name: Checkout - uses: actions/checkout@v2
uses: actions/checkout@v1 - run: npm install
- name: Check JS code formatting convention - run: make checkprettier
uses: creyD/prettier_action@v2.2 mypy:
with: runs-on: ubuntu-latest
dry: True steps:
prettier_options: --write lnbits/static/js/** lnbits/core/static/js/** lnbits/extensions/*/templates/** - uses: actions/checkout@v2
- run: sudo apt-get install python3-venv
- run: sudo apt-get install libev-dev
- run: python3 -m venv venv
- run: ./venv/bin/pip install -r requirements.txt
- run: ./venv/bin/pip install mypy
- run: make mypy

View File

@ -8,7 +8,7 @@ jobs:
runs-on: ubuntu-latest runs-on: ubuntu-latest
strategy: strategy:
matrix: matrix:
python-version: [3.6, 3.7, 3.8] python-version: [3.8]
steps: steps:
- uses: actions/checkout@v2 - uses: actions/checkout@v2

View File

@ -1,10 +1,20 @@
all: prettier mypy black all: format check
format: prettier black
check: mypy checkprettier checkblack
prettier: $(shell find lnbits -name "*.js" -name ".html") prettier: $(shell find lnbits -name "*.js" -name ".html")
./node_modules/.bin/prettier --write lnbits/static/js/*.js lnbits/core/static/js/*.js lnbits/extensions/*/templates/*/*.html ./lnbits/core/templates/core/*.html lnbits/templates/*.html lnbits/extensions/*/static/js/*.js ./node_modules/.bin/prettier --write lnbits/static/js/*.js lnbits/core/static/js/*.js lnbits/extensions/*/templates/*/*.html ./lnbits/core/templates/core/*.html lnbits/templates/*.html lnbits/extensions/*/static/js/*.js
mypy: $(shell find lnbits -name "*.py")
mypy lnbits
black: $(shell find lnbits -name "*.py") black: $(shell find lnbits -name "*.py")
black lnbits ./venv/bin/black --line-length 120 lnbits
mypy: $(shell find lnbits -name "*.py")
./venv/bin/mypy lnbits
checkprettier: $(shell find lnbits -name "*.js" -name ".html")
./node_modules/.bin/prettier --check lnbits/static/js/*.js lnbits/core/static/js/*.js lnbits/extensions/*/templates/*/*.html ./lnbits/core/templates/core/*.html lnbits/templates/*.html lnbits/extensions/*/static/js/*.js
checkblack: $(shell find lnbits -name "*.py")
./venv/bin/black --check --line-length 120 lnbits

View File

@ -1,8 +1,5 @@
{ {
"devDependencies": { "devDependencies": {
"prettier": "^2.0.5" "prettier": "^2.0.5"
},
"scripts": {
"lint": "prettier --write lnbits/static/js/** lnbits/core/static/js/** lnbits/extensions/*/templates/**"
} }
} }