From 5a4f7ef9743ebebe4e2b4e6255cf5d19997f34cb Mon Sep 17 00:00:00 2001
From: Harpo Harbert <ryan_harbert@wgbh.org>
Date: Wed, 20 Mar 2024 15:20:37 -0700
Subject: [PATCH] Adds merge_group to CI/CD events

---
 .github/workflows/CD.yml      | 1 +
 .github/workflows/CI.yml      | 2 +-
 .github/workflows/publish.yml | 8 ++++----
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/CD.yml b/.github/workflows/CD.yml
index 98e69dd..00e90e6 100644
--- a/.github/workflows/CD.yml
+++ b/.github/workflows/CD.yml
@@ -9,6 +9,7 @@ on:
       - main
   release:
     types: [published, edited, prereleased]
+  merge_group:
   workflow_dispatch:
 
 jobs:
diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml
index 779d536..96f46cf 100644
--- a/.github/workflows/CI.yml
+++ b/.github/workflows/CI.yml
@@ -1,6 +1,6 @@
 name: 🧪 Integration Tests
 
-on: [push, pull_request, workflow_dispatch]
+on: [push, pull_request, merge_group, workflow_dispatch]
 
 jobs:
   tests:
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
index 56876a5..0ba5bba 100644
--- a/.github/workflows/publish.yml
+++ b/.github/workflows/publish.yml
@@ -11,10 +11,10 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: 📰 Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: 📲 Setup PDM
-        uses: pdm-project/setup-pdm@v3
+        uses: pdm-project/setup-pdm@v4
         id: setup-python
         with:
           python-version: 3.x
@@ -26,7 +26,7 @@ jobs:
         run: pdm build
 
       - name: 🛫 Export build files
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: dist
           path: dist
@@ -40,7 +40,7 @@ jobs:
       id-token: write
     steps:
       - name: 🛬 Download artifacts
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
 
       - name: 🗞 Publish package
         uses: pypa/gh-action-pypi-publish@release/v1