Skip to content

Commit ca3e284

Browse files
authored
Try to skip extra checks in the CI for up to date PRs in merge queue. (#1010)
* Try to skip extra checks in the CI for up to date PRs in merge queue. * Try to simplify check * Remove expression syntax from `if`s
1 parent 2a59e6a commit ca3e284

File tree

6 files changed

+8
-1
lines changed

6 files changed

+8
-1
lines changed

.github/workflows/build.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,15 @@ jobs:
1616
debug:
1717
name: Build debug APKs
1818
runs-on: ubuntu-latest
19-
if: github.ref != 'refs/heads/main'
19+
if: github.ref != 'refs/heads/main' && github.event.merge_group.base_ref != 'refs/heads/develop'
2020
strategy:
2121
fail-fast: false
2222
# Allow all jobs on develop. Just one per PR.
2323
concurrency:
2424
group: ${{ github.ref == 'refs/heads/develop' && format('build-develop-{0}', github.sha) || format('build-debug-{0}', github.ref) }}
2525
cancel-in-progress: true
2626
steps:
27+
- run: echo ${{ github.event.merge_group.base_ref }}
2728
- uses: actions/checkout@v3
2829
with:
2930
# Ensure we are building the branch and not the branch after being merged on develop

.github/workflows/danger.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ on: [pull_request, merge_group]
55
jobs:
66
build:
77
runs-on: ubuntu-latest
8+
if: github.event.merge_group.base_ref != 'refs/heads/develop'
89
name: Danger main check
910
steps:
1011
- uses: actions/checkout@v3

.github/workflows/gradle-wrapper-validation.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ on:
88
jobs:
99
validation:
1010
name: "Validation"
11+
if: github.event.merge_group.base_ref != 'refs/heads/develop'
1112
runs-on: ubuntu-latest
1213
# No concurrency required, this is a prerequisite to other actions and should run every time.
1314
steps:

.github/workflows/quality.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ jobs:
1616
checkScript:
1717
name: Search for forbidden patterns
1818
runs-on: ubuntu-latest
19+
if: github.event.merge_group.base_ref != 'refs/heads/develop'
1920
steps:
2021
- uses: actions/checkout@v3
2122
- name: Run code quality check suite
@@ -24,6 +25,7 @@ jobs:
2425
check:
2526
name: Project Check Suite
2627
runs-on: ubuntu-latest
28+
if: github.event.merge_group.base_ref != 'refs/heads/develop'
2729
# Allow all jobs on main and develop. Just one per PR.
2830
concurrency:
2931
group: ${{ github.ref == 'refs/heads/main' && format('check-main-{0}', github.sha) || github.ref == 'refs/heads/develop' && format('check-develop-{0}', github.sha) || format('check-{0}', github.ref) }}

.github/workflows/tests.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ jobs:
1616
tests:
1717
name: Runs unit tests
1818
runs-on: ubuntu-latest
19+
if: github.event.merge_group.base_ref != 'refs/heads/develop'
1920

2021
# Allow all jobs on main and develop. Just one per PR.
2122
concurrency:

.github/workflows/validate-lfs.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ on: [pull_request, merge_group]
55
jobs:
66
build:
77
runs-on: ubuntu-latest
8+
if: github.event.merge_group.base_ref != 'refs/heads/develop'
89
name: Validate
910
steps:
1011
- uses: nschloe/[email protected]

0 commit comments

Comments
 (0)