From d3b917a15f0244cda02c0c97b3b2fbd29602e2ab Mon Sep 17 00:00:00 2001
From: Filipe Freire <livrofubia@gmail.com>
Date: Fri, 31 Mar 2023 11:51:31 +0100
Subject: [PATCH] chore: Add merge-group on workflow dispatch (#5872)

---
 .github/workflows/release-recurring.yml | 19 ++++++++++---------
 .github/workflows/test.yml              |  5 +++--
 2 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/release-recurring.yml b/.github/workflows/release-recurring.yml
index 6d4dd12a2..fdea794ce 100644
--- a/.github/workflows/release-recurring.yml
+++ b/.github/workflows/release-recurring.yml
@@ -1,6 +1,7 @@
 name: Release Recurring
 # This workflow bakes executables of the major platforms for Testing purposes
 on:
+  merge_group:
   workflow_dispatch:
   push:
     branches:
@@ -10,8 +11,8 @@ on:
       - opened
       - synchronize
 concurrency:
-      group: ${{ github.workflow }}-${{ github.ref }}
-      cancel-in-progress: true
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
 env:
   PR_NUMBER: ${{ github.event.number }}
 jobs:
@@ -23,12 +24,12 @@ jobs:
       fail-fast: false
       matrix:
         include:
-         - os: "macos-latest"
-           build-targets: "zip"
-         - os: "windows-latest"
-           build-targets: "portable"
-         - os: "ubuntu-latest"
-           build-targets: "tar.gz"
+          - os: "macos-latest"
+            build-targets: "zip"
+          - os: "windows-latest"
+            build-targets: "portable"
+          - os: "ubuntu-latest"
+            build-targets: "tar.gz"
     steps:
       - name: Checkout branch
         uses: actions/checkout@v3
@@ -36,7 +37,7 @@ jobs:
       - name: Setup Node
         uses: actions/setup-node@v3
         with:
-          node-version-file: '.nvmrc'
+          node-version-file: ".nvmrc"
 
       - name: Bootstrap packages
         run: npm run bootstrap
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 0deb2375b..db1ac670d 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -1,6 +1,7 @@
 name: Test
 
 on:
+  merge_group:
   workflow_dispatch:
   push:
     branches:
@@ -28,7 +29,7 @@ jobs:
       - name: Setup Node
         uses: actions/setup-node@v3
         with:
-          node-version-file: '.nvmrc'
+          node-version-file: ".nvmrc"
 
       - name: Bootstrap packages
         run: npm run bootstrap
@@ -50,7 +51,7 @@ jobs:
 
       - name: Build app for smoke tests
         env:
-          NODE_OPTIONS: '--max_old_space_size=6144'
+          NODE_OPTIONS: "--max_old_space_size=6144"
         run: npm run app-build
 
       - name: Run Smoke tests (CI)