Просмотр исходного кода

Merge pull request #7024 from netbox-community/feature-precommit-ui

Run UI Lint, Type, and Formatting Checks in Pre-Commit and CI
Jeremy Stretch 4 лет назад
Родитель
Сommit
b63c838c74
2 измененных файлов с 17 добавлено и 1 удалено
  1. 11 1
      .github/workflows/ci.yml
  2. 6 0
      scripts/git-hooks/pre-commit

+ 11 - 1
.github/workflows/ci.yml

@@ -6,6 +6,7 @@ jobs:
     strategy:
       matrix:
         python-version: [3.7, 3.8, 3.9]
+        node-version: [14.x, 15.x]
     services:
       redis:
         image: redis
@@ -33,12 +34,18 @@ jobs:
       with:
         python-version: ${{ matrix.python-version }}
 
+    - name: Use Node.js ${{ matrix.node-version }}
+      uses: actions/setup-node@v2
+      with:
+        node-version: ${{ matrix.node-version }}
+
     - name: Install dependencies & set up configuration
       run: |
         python -m pip install --upgrade pip
         pip install -r requirements.txt
         pip install pycodestyle coverage
         ln -s configuration.testing.py netbox/netbox/configuration.py
+        yarn --cwd netbox/project-static
 
     - name: Build documentation
       run: mkdocs build
@@ -47,7 +54,10 @@ jobs:
       run: python netbox/manage.py collectstatic --no-input
 
     - name: Check PEP8 compliance
-      run: pycodestyle --ignore=W504,E501 netbox/
+      run: pycodestyle --ignore=W504,E501 --exclude=node_modules netbox/
+
+    - name: Check UI ESLint, TypeScript, and Prettier Compliance
+      run: yarn --cwd netbox/project-static validate
 
     - name: Run tests
       run: coverage run --source="netbox/" netbox/manage.py test netbox/

+ 6 - 0
scripts/git-hooks/pre-commit

@@ -34,6 +34,12 @@ if [ $? != 0 ]; then
 	EXIT=1
 fi
 
+echo "Checking UI ESLint, TypeScript, and Prettier compliance..."
+yarn --cwd "$PWD/netbox/project-static" validate
+if [ $? != 0 ]; then
+	EXIT=1
+fi
+
 if [ $EXIT != 0 ]; then
   printf "${RED}COMMIT FAILED${NOCOLOR}\n"
 fi