Skip to content

Commit

Permalink
Merge pull request #466 from to-sta/eslintWorkflow
Browse files Browse the repository at this point in the history
eslint workflow added and contine-on-error added
  • Loading branch information
andrewtavis authored Oct 16, 2023
2 parents 96b3d77 + 5d041aa commit 43230e2
Show file tree
Hide file tree
Showing 6 changed files with 24 additions and 11 deletions.
4 changes: 3 additions & 1 deletion .github/workflows/pr_ci_backend.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ on:

jobs:
backend:
name: Run PR Backend Formatting Check
name: Run PR Backend Check
runs-on: ubuntu-latest
steps:
- name: Checkout
Expand All @@ -32,9 +32,11 @@ jobs:
with:
options: --check --verbose --exclude "migrations/"
src: ./backend
continue-on-error: true

- name: Run ruff - Linting and import sorting check
run: ruff ./backend
continue-on-error: true

- name: Run mypy - Static Type Checking
run: mypy ./backend --config-file ./backend/mypy.ini
15 changes: 11 additions & 4 deletions .github/workflows/pr_ci_frontend.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,16 +11,16 @@ on:

jobs:
frontend:
name: Run PR Frontend Formatting Check
name: Run PR Frontend Check
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v3

- name: Setup Node
- name: Setup Node environment
uses: actions/setup-node@v3

- name: Yarn Install
- name: Install Yarn
uses: borales/actions-yarn@v4
with:
cmd: install
Expand All @@ -29,7 +29,7 @@ jobs:
- name: Install Prettier
run: yarn add prettier

- name: Run Prettier
- name: Run Prettier - Formatting check
working-directory: ./frontend
run: |
yarn prettier . --check --config ../.prettierrc --ignore-path ../.prettierignore
Expand All @@ -40,3 +40,10 @@ jobs:
with:
cmd: nuxi typecheck
dir: "frontend"
continue-on-error: true

- name: Run eslint - Linting
uses: borales/actions-yarn@v4
with:
cmd: eslint . --ext .js,.vue
dir: "frontend"
3 changes: 2 additions & 1 deletion backend/authentication/serializers.py
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
import re
from typing import Any, Dict, Union

from content.models import Resource, Task, Topic
from django.utils.translation import gettext as _
from rest_framework import serializers

from content.models import Resource, Task, Topic
from utils.utils import (
validate_creation_and_deletion_dates,
validate_empty,
Expand Down
3 changes: 2 additions & 1 deletion backend/content/serializers.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,9 @@
from typing import Any, Dict, Union

from django.utils.translation import gettext as _
from events.models import Format
from rest_framework import serializers

from events.models import Format
from utils.utils import (
validate_creation_and_deletion_dates,
validate_creation_and_deprecation_dates,
Expand Down
5 changes: 3 additions & 2 deletions backend/entities/serializers.py
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
from typing import Dict, Union

from django.utils.translation import gettext as _
from rest_framework import serializers

from authentication.models import User
from content.models import Resource, Task, Topic
from django.utils.translation import gettext as _
from events.models import Event
from rest_framework import serializers
from utils.utils import (
validate_creation_and_deletion_dates,
validate_empty,
Expand Down
5 changes: 3 additions & 2 deletions backend/events/serializers.py
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
from typing import Dict, Union

from authentication.models import User
from content.models import Resource, Task, Topic
from django.utils.translation import gettext as _
from rest_framework import serializers

from authentication.models import User
from content.models import Resource, Task, Topic
from utils.utils import (
validate_creation_and_deletion_dates,
validate_creation_and_deprecation_dates,
Expand Down

0 comments on commit 43230e2

Please sign in to comment.