From 9c00d7492413cc1889b7b88d0533e9c32c87f86e Mon Sep 17 00:00:00 2001
From: fkwp <fkwp@users.noreply.github.com>
Date: Thu, 11 Apr 2024 07:42:56 +0000
Subject: [PATCH 1/3] switch to build_reusable

---
 .github/workflows/netlify-pr.yaml | 26 +++++++++++++++-----------
 1 file changed, 15 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/netlify-pr.yaml b/.github/workflows/netlify-pr.yaml
index 76a9bd96..8da72096 100644
--- a/.github/workflows/netlify-pr.yaml
+++ b/.github/workflows/netlify-pr.yaml
@@ -1,13 +1,20 @@
 name: Netlify PR Preview
 on:
-  workflow_run:
-    workflows: ["Build"]
+  pull_request:
     types:
-      - completed
-    branches-ignore:
-      - "main"
-      - "livekit"
+      - synchronize
+      - opened
+      - labeled
+
 jobs:
+  build_element_call:
+    if: ${{ contains(github.event.pull_request.labels.*.name, 'docker build') && github.event.pull_request.head.repo.full_name == github.repository }}
+    uses: ./.github/workflows/build_resuable.yaml
+    secrets:
+      SENTRY_ORG: ${{ secrets.SENTRY_ORG }}
+      SENTRY_PROJECT: ${{ secrets.SENTRY_PROJECT }}
+      SENTRY_URL: ${{ secrets.SENTRY_URL }}
+      SENTRY_AUTH_TOKEN: ${{ secrets.SENTRY_AUTH_TOKEN }}
   deploy:
     if: github.event.workflow_run.conclusion == 'success' && github.event.workflow_run.event == 'pull_request'
     runs-on: ubuntu-latest
@@ -33,13 +40,10 @@ jobs:
           owner: ${{ github.event.workflow_run.head_repository.owner.login }}
           branch: ${{ github.event.workflow_run.head_branch }}
 
-      # There's a 'download artifact' action, but it hasn't been updated for the workflow_run action
-      # (https://github.com/actions/download-artifact/issues/60) so instead we get this mess:
       - name: 📥 Download artifact
-        uses: dawidd6/action-download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
-          run_id: ${{ github.event.workflow_run.id }}
-          name: build
+          name: build-output
           path: webapp
 
       - name: Add redirects file

From 884491d60e52e2c4aba018e1fd80007de063ce0d Mon Sep 17 00:00:00 2001
From: fkwp <fkwp@users.noreply.github.com>
Date: Thu, 11 Apr 2024 07:45:59 +0000
Subject: [PATCH 2/3] depend deploy on build

---
 .github/workflows/netlify-pr.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/netlify-pr.yaml b/.github/workflows/netlify-pr.yaml
index 8da72096..b935ba5e 100644
--- a/.github/workflows/netlify-pr.yaml
+++ b/.github/workflows/netlify-pr.yaml
@@ -16,7 +16,7 @@ jobs:
       SENTRY_URL: ${{ secrets.SENTRY_URL }}
       SENTRY_AUTH_TOKEN: ${{ secrets.SENTRY_AUTH_TOKEN }}
   deploy:
-    if: github.event.workflow_run.conclusion == 'success' && github.event.workflow_run.event == 'pull_request'
+    needs: build_element_call
     runs-on: ubuntu-latest
     permissions:
       deployments: write

From 1daca7a0d9ac7a1d591359ee118bc0c9f24d2379 Mon Sep 17 00:00:00 2001
From: fkwp <fkwp@users.noreply.github.com>
Date: Thu, 11 Apr 2024 07:46:26 +0000
Subject: [PATCH 3/3] cleanup

---
 .github/workflows/netlify-pr.yaml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.github/workflows/netlify-pr.yaml b/.github/workflows/netlify-pr.yaml
index b935ba5e..badd0dd4 100644
--- a/.github/workflows/netlify-pr.yaml
+++ b/.github/workflows/netlify-pr.yaml
@@ -8,7 +8,6 @@ on:
 
 jobs:
   build_element_call:
-    if: ${{ contains(github.event.pull_request.labels.*.name, 'docker build') && github.event.pull_request.head.repo.full_name == github.repository }}
     uses: ./.github/workflows/build_resuable.yaml
     secrets:
       SENTRY_ORG: ${{ secrets.SENTRY_ORG }}