From f4545adc1c4edea4d01aed18a24b89448b242c7b Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Thu, 22 Sep 2022 08:30:40 +0200
Subject: [PATCH] Merge GitHub actions

---
 .github/workflows/check-format-and-lint.yaml  | 24 -------------------
 ...loy-gh-pages.yaml => lint-and-deploy.yaml} | 13 +++++++++-
 2 files changed, 12 insertions(+), 25 deletions(-)
 delete mode 100644 .github/workflows/check-format-and-lint.yaml
 rename .github/workflows/{deploy-gh-pages.yaml => lint-and-deploy.yaml} (59%)

diff --git a/.github/workflows/check-format-and-lint.yaml b/.github/workflows/check-format-and-lint.yaml
deleted file mode 100644
index ac26472..0000000
--- a/.github/workflows/check-format-and-lint.yaml
+++ /dev/null
@@ -1,24 +0,0 @@
-name: Check formatting and lint
-
-on:
-  push:
-    branches:
-      - main
-  pull_request:
-    branches:
-      - main
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v2
-      - name: Lint
-        run: |
-          npm ci
-          npm run lint
-
-          git diff
-          if [[ `git status --porcelain` ]]; then
-            exit 1
-          fi
diff --git a/.github/workflows/deploy-gh-pages.yaml b/.github/workflows/lint-and-deploy.yaml
similarity index 59%
rename from .github/workflows/deploy-gh-pages.yaml
rename to .github/workflows/lint-and-deploy.yaml
index b544394..f12fde3 100644
--- a/.github/workflows/deploy-gh-pages.yaml
+++ b/.github/workflows/lint-and-deploy.yaml
@@ -1,10 +1,21 @@
-name: Build and deploy to GitHub Pages
+name: Check, build and deploy to GitHub Pages
 on:
   push:
     branches:
       - main
 
 jobs:
+  check:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - name: Lint
+        run: |
+          npm ci
+          npm run lint && git diff
+          if [[ `git status --porcelain` ]]; then
+            exit 1
+          fi
   build-and-deploy:
     concurrency: ci-${{ github.ref }}
     runs-on: ubuntu-latest