From 6a20ef5db812b8b72956130e2c4468b421a48c1e Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Mon, 22 Jul 2024 14:01:44 +0000
Subject: [PATCH] =?UTF-8?q?fix:=20merge=20group=20triggering=20twice=20and?=
 =?UTF-8?q?=20incorrect=20for=20RC=20(WPB-8645)=20=F0=9F=8D=92=20(#3216)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Yamil Medina <yamilmedina@users.noreply.github.com>
---
 .github/workflows/build-develop-app.yml     | 4 ++++
 .github/workflows/build-rc-app.yml          | 4 +++-
 .github/workflows/gradle-run-unit-tests.yml | 5 ++---
 3 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/build-develop-app.yml b/.github/workflows/build-develop-app.yml
index 204e7de3d78..931904f9e79 100644
--- a/.github/workflows/build-develop-app.yml
+++ b/.github/workflows/build-develop-app.yml
@@ -4,13 +4,17 @@ on:
     branches:
       - develop
   merge_group:
+    types: [ checks_requested ]
+    branches: [ develop ]
   pull_request:
     branches:
       - develop
     types: [ opened, synchronize ]
+
 concurrency:
   group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.event.merge_group.head_sha }}
   cancel-in-progress: true
+
 jobs:
   code-analysis:
     uses: ./.github/workflows/code-analysis.yml
diff --git a/.github/workflows/build-rc-app.yml b/.github/workflows/build-rc-app.yml
index 2ef9128606b..cefc4f322bb 100644
--- a/.github/workflows/build-rc-app.yml
+++ b/.github/workflows/build-rc-app.yml
@@ -4,11 +4,13 @@ on:
   push:
     branches:
       - release/candidate
+  merge_group:
+    types: [ checks_requested ]
+    branches: [ release/candidate ]
   pull_request:
     branches:
       - release/candidate
     types: [ opened, synchronize ]
-  workflow_call:
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.event.merge_group.head_sha }}
diff --git a/.github/workflows/gradle-run-unit-tests.yml b/.github/workflows/gradle-run-unit-tests.yml
index 9de98f4ca4f..bc5dfb12813 100644
--- a/.github/workflows/gradle-run-unit-tests.yml
+++ b/.github/workflows/gradle-run-unit-tests.yml
@@ -75,10 +75,9 @@ jobs:
           merge-multiple: true
 
       - name: Upload code coverage to codecov
-        uses: codecov/codecov-action@v4
-        env:
-          CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
+        uses: codecov/codecov-action@v4.5.0
         with:
+          token: ${{ secrets.CODECOV_TOKEN }}
           files: "app/build/reports/kover/report.xml"
 
       - name: Cleanup Gradle Cache