Merge branch 'main' into dev

This commit is contained in:
Veronica Berglyd Olsen
2023-06-01 15:26:08 +02:00
4 changed files with 7 additions and 10 deletions
+4 -7
View File
@@ -2,7 +2,7 @@ name: flake8
on: on:
push: push:
branches: branches:
- main - main
- dev - dev
pull_request: pull_request:
@@ -25,9 +25,6 @@ jobs:
run: pip install flake8 run: pip install flake8
- name: Syntax Error Check - name: Syntax Error Check
run: | run: |
flake8 novelwriter --count --select=E9,F63,F7,F82 --show-source --statistics flake8 --version
flake8 tests --count --select=E9,F63,F7,F82 --show-source --statistics flake8 novelwriter --count --show-source --statistics
- name: Coding Style Violations flake8 tests --count --show-source --statistics
run: |
flake8 novelwriter --count --max-line-length=99 --ignore E133,E221,E226,E228,E241,W503 --show-source --statistics
flake8 tests --count --max-line-length=99 --ignore E133,E221,E226,E228,E241,W503 --show-source --statistics
+1 -1
View File
@@ -2,7 +2,7 @@ name: Linux
on: on:
push: push:
branches: branches:
- main - main
- dev - dev
pull_request: pull_request:
+1 -1
View File
@@ -2,7 +2,7 @@ name: macOS
on: on:
push: push:
branches: branches:
- main - main
- dev - dev
pull_request: pull_request:
+1 -1
View File
@@ -2,7 +2,7 @@ name: Windows
on: on:
push: push:
branches: branches:
- main - main
- dev - dev
pull_request: pull_request: