From 0e55a07def285f253003b65ad660bedabb3bc262 Mon Sep 17 00:00:00 2001
From: Matthias <matthias.mair@oewf.org>
Date: Thu, 2 Dec 2021 12:49:37 +0100
Subject: [PATCH] merge in html

---
 .github/workflows/html.yaml      | 53 --------------------------------
 .github/workflows/pr_checks.yaml | 36 ++++++++++++++++++++++
 2 files changed, 36 insertions(+), 53 deletions(-)
 delete mode 100644 .github/workflows/html.yaml

diff --git a/.github/workflows/html.yaml b/.github/workflows/html.yaml
deleted file mode 100644
index d0084ae032..0000000000
--- a/.github/workflows/html.yaml
+++ /dev/null
@@ -1,53 +0,0 @@
-# Check javascript template files
-
-name: HTML Templates
-
-on:
-  push:
-    branches:
-      - master
-
-  pull_request:
-    branches-ignore:
-      - l10*
-
-jobs:
-
-  html:
-    runs-on: ubuntu-latest
-
-    env:
-      GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-      INVENTREE_DB_ENGINE: sqlite3
-      INVENTREE_DB_NAME: inventree
-      INVENTREE_MEDIA_ROOT: ./media
-      INVENTREE_STATIC_ROOT: ./static
-    steps:
-      - name: Install node.js
-        uses: actions/setup-node@v2
-      - run: npm install
-      - name: Checkout Code
-        uses: actions/checkout@v2
-      - name: Setup Python
-        uses: actions/setup-python@v2
-        with:
-          python-version: 3.7
-      - name: Install Dependencies
-        run: |
-          sudo apt-get update
-          sudo apt-get install gettext
-          pip3 install invoke
-          invoke install
-          invoke static
-      - name: Check HTML Files
-        run: |
-          npm install markuplint
-          npx markuplint InvenTree/build/templates/build/*.html
-          npx markuplint InvenTree/company/templates/company/*.html
-          npx markuplint InvenTree/order/templates/order/*.html
-          npx markuplint InvenTree/part/templates/part/*.html
-          npx markuplint InvenTree/stock/templates/stock/*.html
-          npx markuplint InvenTree/templates/*.html
-          npx markuplint InvenTree/templates/InvenTree/*.html
-          npx markuplint InvenTree/templates/InvenTree/settings/*.html
-
diff --git a/.github/workflows/pr_checks.yaml b/.github/workflows/pr_checks.yaml
index 4d0e8fcd0e..867467cdd4 100644
--- a/.github/workflows/pr_checks.yaml
+++ b/.github/workflows/pr_checks.yaml
@@ -88,3 +88,39 @@ jobs:
           npm install eslint eslint-config-google
           invoke render-js-files
           npx eslint js_tmp/*.js
+
+  html:
+    name: html template files
+    needs: javascript
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout Code
+        uses: actions/checkout@v2
+      - name: Install node.js ${{ env.node_version }}
+        uses: actions/setup-node@v2
+        with:
+          node-version: ${{ env.node_version }}
+      - run: npm install
+      - name: Setup Python
+        uses: actions/setup-python@v2
+        with:
+          python-version: ${{ env.python_version }}
+      - name: Install Dependencies
+        run: |
+          sudo apt-get update
+          sudo apt-get install gettext
+          pip3 install invoke
+          invoke install
+          invoke static
+      - name: Check HTML Files
+        run: |
+          npm install markuplint
+          npx markuplint InvenTree/build/templates/build/*.html
+          npx markuplint InvenTree/company/templates/company/*.html
+          npx markuplint InvenTree/order/templates/order/*.html
+          npx markuplint InvenTree/part/templates/part/*.html
+          npx markuplint InvenTree/stock/templates/stock/*.html
+          npx markuplint InvenTree/templates/*.html
+          npx markuplint InvenTree/templates/InvenTree/*.html
+          npx markuplint InvenTree/templates/InvenTree/settings/*.html