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