From 16f34934bb58abfdcc5ee3334b40ba0fe2a6e533 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?John=20Molakvo=C3=A6?= <skjnldsv@users.noreply.github.com>
Date: Mon, 3 Feb 2020 13:17:33 +0100
Subject: [PATCH] Adjust node build

---
 .github/workflows/lint.yml | 30 ++++++++++++++----------------
 .github/workflows/node.yml | 27 ++++++++++++---------------
 2 files changed, 26 insertions(+), 31 deletions(-)

diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
index dfa93b5d2..be09af5e4 100644
--- a/.github/workflows/lint.yml
+++ b/.github/workflows/lint.yml
@@ -8,8 +8,7 @@ on:
       - stable*
 
 jobs:
-  php-linters:
-
+  php:
     runs-on: ubuntu-latest
 
     strategy:
@@ -28,21 +27,20 @@ jobs:
     - name: Lint
       run: composer run lint
 
-  node-linters:
-
+  node:
     runs-on: ubuntu-latest
 
-    name: ESLint
+    strategy:
+      matrix:
+        node-version: [12.x]
 
     steps:
-    - uses: actions/checkout@master
-    - name: Use node ${{ matrix.node-version }}
-      uses: actions/setup-node@v1
-      with:
-        node-version: 12.x
-    - name: Install dependencies
-      run: npm ci
-    - name: ESLint
-      run: npm run lint
-    env:
-      CI: true
+      - uses: actions/checkout@v2
+      - name: Use node ${{ matrix.node-version }}
+        uses: actions/setup-node@v1
+        with:
+          node-version: ${{ matrix.node-version }}
+      - name: Install dependencies
+        run: npm ci
+      - name: ESLint
+        run: npm run lint
diff --git a/.github/workflows/node.yml b/.github/workflows/node.yml
index 6b65c3407..df5c11662 100644
--- a/.github/workflows/node.yml
+++ b/.github/workflows/node.yml
@@ -9,7 +9,6 @@ on:
 
 jobs:
   build:
-
     runs-on: ubuntu-latest
 
     strategy:
@@ -17,17 +16,15 @@ jobs:
         node-version: [12.x]
 
     steps:
-    - uses: actions/checkout@v1
-    - name: Use node ${{ matrix.node-version }}
-      uses: actions/setup-node@v1
-      with:
-        node-version: ${{ matrix.node-version }}
-    - name: Install dependencies & build
-      run: |
-        npm ci
-        npm run build --if-present
-    - name: Check webpack build changes
-      run: |
-        bash -c "[[ ! \"`git status --porcelain `\" ]] || ( echo 'Uncommited changes in webpack build' && git status && exit 1 )"
-      env:
-        CI: true
+      - uses: actions/checkout@v2
+      - name: Use node ${{ matrix.node-version }}
+        uses: actions/setup-node@v1
+        with:
+          node-version: ${{ matrix.node-version }}
+      - name: Install dependencies & build
+        run: |
+          npm ci
+          npm run build --if-present
+      - name: Check webpack build changes
+        run: |
+          bash -c "[[ ! \"`git status --porcelain `\" ]] || ( echo 'Uncommited changes in webpack build' && git status && exit 1 )"