From 2492ab389b04cb8604fd48e33a39a5e0e56e2117 Mon Sep 17 00:00:00 2001
From: George <31376482+george-gca@users.noreply.github.com>
Date: Sat, 27 Jan 2024 22:58:40 -0300
Subject: [PATCH] Workflow fix (#2136)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: George Araújo <george.gcac@gmail.com>
---
 .github/workflows/axe.yml               |  1 -
 .github/workflows/broken-links-site.yml |  1 -
 .github/workflows/broken-links.yml      |  2 ++
 .github/workflows/deploy.yml            | 42 +++++++++++++++++++++----
 4 files changed, 38 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/axe.yml b/.github/workflows/axe.yml
index 82bbffba4cb2..e1b49d447360 100644
--- a/.github/workflows/axe.yml
+++ b/.github/workflows/axe.yml
@@ -47,7 +47,6 @@ jobs:
       - name: Install and Build 🔧
         run: |
           pip3 install --upgrade jupyter
-          npm install -g mermaid.cli
           export JEKYLL_ENV=production
           bundle exec jekyll build --lsi
       - name: Purge unused CSS 🧹
diff --git a/.github/workflows/broken-links-site.yml b/.github/workflows/broken-links-site.yml
index 1e322b507916..779eefff328e 100644
--- a/.github/workflows/broken-links-site.yml
+++ b/.github/workflows/broken-links-site.yml
@@ -35,7 +35,6 @@ jobs:
       - name: Install and Build 🔧
         run: |
           pip3 install --upgrade jupyter
-          npm install -g mermaid.cli
           export JEKYLL_ENV=production
           bundle exec jekyll build --lsi
       - name: Purge unused CSS 🧹
diff --git a/.github/workflows/broken-links.yml b/.github/workflows/broken-links.yml
index c91796fdb1db..280ba80ce09d 100644
--- a/.github/workflows/broken-links.yml
+++ b/.github/workflows/broken-links.yml
@@ -16,6 +16,7 @@ on:
       - "!.github/workflows/deploy-docker-tag.yml"
       - "!.github/workflows/deploy-image.yml"
       - "!.github/workflows/docker-slim.yml"
+      - "!.github/workflows/lighthouse-badger.yml"
       - "!.github/workflows/prettier.yml"
   pull_request:
     branches:
@@ -32,6 +33,7 @@ on:
       - "!.github/workflows/deploy-docker-tag.yml"
       - "!.github/workflows/deploy-image.yml"
       - "!.github/workflows/docker-slim.yml"
+      - "!.github/workflows/lighthouse-badger.yml"
       - "!.github/workflows/prettier.yml"
 
 jobs:
diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index 69cb8e98944e..f583e1a2f2fe 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -1,9 +1,42 @@
 name: Deploy site
 
 on:
-  workflow_run:
-    workflows: [Check for broken links]
-    types: [completed]
+  push:
+    branches:
+      - master
+      - main
+    paths:
+      - "assets/**"
+      - "**.html"
+      - "**.js"
+      - "**.liquid"
+      - "**/*.md"
+      - "**.yml"
+      - "!.github/workflows/axe.yml"
+      - "!.github/workflows/broken-links.yml"
+      - "!.github/workflows/deploy-docker-tag.yml"
+      - "!.github/workflows/deploy-image.yml"
+      - "!.github/workflows/docker-slim.yml"
+      - "!.github/workflows/lighthouse-badger.yml"
+      - "!.github/workflows/prettier.yml"
+  pull_request:
+    branches:
+      - master
+      - main
+    paths:
+      - "assets/**"
+      - "**.html"
+      - "**.js"
+      - "**.liquid"
+      - "**/*.md"
+      - "**.yml"
+      - "!.github/workflows/axe.yml"
+      - "!.github/workflows/broken-links.yml"
+      - "!.github/workflows/deploy-docker-tag.yml"
+      - "!.github/workflows/deploy-image.yml"
+      - "!.github/workflows/docker-slim.yml"
+      - "!.github/workflows/lighthouse-badger.yml"
+      - "!.github/workflows/prettier.yml"
   workflow_dispatch:
 
 permissions:
@@ -11,8 +44,6 @@ permissions:
 
 jobs:
   deploy:
-    # https://docs.github.com/en/actions/using-workflows/events-that-trigger-workflows#running-a-workflow-based-on-the-conclusion-of-another-workflow
-    if: ${{ github.event.workflow_run.conclusion == 'success' || github.event_name == 'workflow_dispatch' }}
     # available images: https://github.com/actions/runner-images#available-images
     runs-on: ubuntu-latest
     steps:
@@ -33,7 +64,6 @@ jobs:
       - name: Install and Build 🔧
         run: |
           pip3 install --upgrade jupyter
-          npm install -g mermaid.cli
           export JEKYLL_ENV=production
           bundle exec jekyll build --lsi
       - name: Purge unused CSS 🧹