From 31ff501f39ce46b7615a1064af9be63a9a69ddc4 Mon Sep 17 00:00:00 2001
From: Jean Regisser <jean.regisser@gmail.com>
Date: Thu, 30 Jan 2025 09:02:41 +0100
Subject: [PATCH] ci: allow dry-run in merge queue and address deprecation
 notice

---
 .github/workflows/release.yml | 3 ++-
 package.json                  | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index f6aefe6c1b..27567ae8c1 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -15,12 +15,13 @@ on:
   pull_request:
     branches:
       - main
+  merge_group:
 
 jobs:
   publish:
     name: ${{ github.ref == 'refs/heads/main' && 'Publish' || 'Publish (dry-run)' }}
     # Only run if the test workflow succeeded or it's a PR (where we don't want to delay the dry run)
-    if: ${{ github.event.workflow_run.conclusion == 'success' || github.event_name == 'pull_request' }}
+    if: ${{ github.event.workflow_run.conclusion == 'success' || github.event_name == 'pull_request' || github.event_name == 'merge_group' }}
     runs-on: ubuntu-latest
     permissions:
       contents: write # to be able to publish a GitHub release
diff --git a/package.json b/package.json
index 376ba22c5c..96befc02e7 100644
--- a/package.json
+++ b/package.json
@@ -135,7 +135,7 @@
       [
         "@semantic-release/github",
         {
-          "successComment": false,
+          "successCommentCondition": false,
           "releasedLabels": false
         }
       ]