Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Merged
merged 4 commits into from
Jul 22, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions .github/workflows/build-develop-app.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 3 additions & 1 deletion .github/workflows/build-rc-app.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand Down
5 changes: 2 additions & 3 deletions .github/workflows/gradle-run-unit-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading