From 334e3c5682843b2934096e2aa0bafda2225f8672 Mon Sep 17 00:00:00 2001
From: Nikita Karamov <nick@karamoff.dev>
Date: Sun, 17 Jan 2021 00:10:57 +0300
Subject: [PATCH] Simplify GH Action workflow

---
 .github/workflows/ci.yml   | 57 ++++++++++++++++++++++++++++++++++++++
 .github/workflows/node.yml | 41 ---------------------------
 2 files changed, 57 insertions(+), 41 deletions(-)
 create mode 100644 .github/workflows/ci.yml
 delete mode 100644 .github/workflows/node.yml

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
new file mode 100644
index 0000000..8e08f33
--- /dev/null
+++ b/.github/workflows/ci.yml
@@ -0,0 +1,57 @@
+name: Node.js CI
+
+on:
+  push:
+    branches:
+      - master
+      - v*
+  pull_request:
+    branches:
+      - master
+
+jobs:
+  lint:
+    name: Lint package
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v2
+      - name: Setup Node
+        uses: actions/setup-node@v2
+        with:
+          node-version: '14'
+      - name: Install dependencies
+        run: yarn
+      - name: Lint
+        run: yarn lint
+
+  build-docs:
+    name: Build and test package and deploy docs
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v2
+      - name: Setup Node
+        uses: actions/setup-node@v2
+        with:
+          node-version: '14'
+      - name: Install dependencies
+        run: yarn
+      - name: Test package
+        run: yarn test
+
+      - name: Copy built files to docs
+        run: cp ./dist/shareon.min.* ./docs
+        if: ${{ github.ref == 'refs/heads/master' }}
+      - name: Deploy to GitHub Pages
+        uses: crazy-max/ghaction-github-pages@v2
+        with:
+          keep_history: true
+          build_dir: docs
+          fqdn: shareon.js.org
+          jekyll: false
+        if: ${{ github.ref == 'refs/heads/master' }}
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
diff --git a/.github/workflows/node.yml b/.github/workflows/node.yml
deleted file mode 100644
index b7db88d..0000000
--- a/.github/workflows/node.yml
+++ /dev/null
@@ -1,41 +0,0 @@
-name: Node.js CI
-
-on:
-  push:
-    branches:
-      - master
-      - develop
-      - release/*
-  pull_request:
-    branches:
-      - master
-
-jobs:
-  build:
-    name: Node.js CI
-    runs-on: ubuntu-latest
-
-    steps:
-      - uses: actions/checkout@v2
-      - name: Setup Node.js
-        uses: actions/setup-node@v1
-        with:
-          node-version: 14
-      - name: Install Yarn
-        uses: bahmutov/npm-install@v1.1.0
-      - name: Test
-        run: yarn test
-        
-      - name: Copy built files to docs
-        run: cp ./dist/shareon.min.* ./docs
-        if: ${{ github.ref == 'refs/heads/master' }}
-      - name: Deploy to GitHub Pages
-        uses: crazy-max/ghaction-github-pages@v2.1.2
-        with:
-          keep_history: true
-          build_dir: docs
-          fqdn: shareon.js.org
-          jekyll: false
-        if: ${{ github.ref == 'refs/heads/master' }}
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}