From 9aeff034f5cdf4e22090904bf9dfecf439b34658 Mon Sep 17 00:00:00 2001
From: Daniel Baumann <daniel.baumann@progress-linux.org>
Date: Wed, 3 May 2023 11:10:03 +0200
Subject: Merging upstream version 1.10.5+dfsg.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
---
 .github/workflows/deploy.yml | 16 +++++++---------
 .github/workflows/lint.yml   | 37 +++++++++++++++++++++++++++++++++++++
 .github/workflows/test.yml   |  4 ++--
 3 files changed, 46 insertions(+), 11 deletions(-)
 create mode 100644 .github/workflows/lint.yml

(limited to '.github')

diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index 4e9a939..c203bbc 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -4,15 +4,16 @@ on:
   release:
     types:
       - published
+  workflow_dispatch:
 
 env:
   FORCE_COLOR: 2
   NODE: 18
 
 jobs:
-  deploy:
+  build:
     runs-on: ubuntu-latest
-    if: github.repository == 'twbs/icons'
+    if: github.repository == 'twbs/icons' && startsWith(github.ref, 'refs/tags/v')
 
     steps:
       - name: Clone repository
@@ -29,11 +30,8 @@ jobs:
       - name: Install npm dependencies
         run: npm ci
 
-      - name: Build the icons
-        run: npm run icons
-
-      - name: Build the docs
-        run: npm run docs-build
+      - name: Prepare release
+        run: npm run release
 
       - name: Deploy docs
         uses: peaceiris/actions-gh-pages@v3
@@ -44,9 +42,9 @@ jobs:
           publish_dir: ./_site/
 
   publish:
-    needs: deploy
+    needs: build
     runs-on: ubuntu-latest
-    if: github.repository == 'twbs/icons'
+    if: github.repository == 'twbs/icons' && startsWith(github.ref, 'refs/tags/v')
 
     steps:
       - name: Clone repository
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
new file mode 100644
index 0000000..aaa70d5
--- /dev/null
+++ b/.github/workflows/lint.yml
@@ -0,0 +1,37 @@
+name: Lint
+
+on:
+  push:
+    branches:
+      - main
+  pull_request:
+  workflow_dispatch:
+
+env:
+  FORCE_COLOR: 2
+  NODE: 18
+
+permissions:
+  contents: read
+
+jobs:
+  lint:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Clone repository
+        uses: actions/checkout@v3
+        with:
+          persist-credentials: false
+
+      - name: Set up Node.js
+        uses: actions/setup-node@v3
+        with:
+          node-version: "${{ env.NODE }}"
+          cache: npm
+
+      - name: Install npm dependencies
+        run: npm ci
+
+      - name: Lint
+        run: npm run test
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 493a4df..84c483f 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -39,8 +39,8 @@ jobs:
       - name: Build the icons
         run: npm run icons
 
-      - name: Run tests
-        run: npm test
+      - name: Build and test docs
+        run: npm run docs-test
 
       - name: Run linkinator
         uses: JustinBeckwith/linkinator-action@v1
-- 
cgit v1.2.3