fix: merge group triggering twice and incorrect for RC (WPB-8645) 🍒 (#…

…3216)

Co-authored-by: Yamil Medina <[email protected]>

.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

.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 }}

.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/[email protected]
         with:
+          token: ${{ secrets.CODECOV_TOKEN }}
           files: "app/build/reports/kover/report.xml"
 
       - name: Cleanup Gradle Cache