mirror of
https://github.com/Novaloop-AG/element-x-android.git
synced 2026-11-02 21:32:34 +00:00
Revert merge queue CI optimizations
This commit is contained in:
@@ -16,8 +16,8 @@ jobs:
|
|||||||
debug:
|
debug:
|
||||||
name: Build APKs
|
name: Build APKs
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
# Skip for `main` and the merge queue if the branch is up to date with `develop`
|
# Skip for `main`
|
||||||
if: github.ref != 'refs/heads/main' && github.event.merge_group.base_ref != 'refs/heads/develop'
|
if: github.ref != 'refs/heads/main'
|
||||||
strategy:
|
strategy:
|
||||||
matrix:
|
matrix:
|
||||||
variant: [debug, release, nightly, samples]
|
variant: [debug, release, nightly, samples]
|
||||||
|
|||||||
@@ -5,8 +5,6 @@ on: [pull_request, merge_group]
|
|||||||
jobs:
|
jobs:
|
||||||
build:
|
build:
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
# Don't run in the merge queue again if the branch is up to date with `develop`
|
|
||||||
if: github.event.merge_group.base_ref != 'refs/heads/develop'
|
|
||||||
name: Danger main check
|
name: Danger main check
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v3
|
- uses: actions/checkout@v3
|
||||||
|
|||||||
@@ -8,8 +8,6 @@ on:
|
|||||||
jobs:
|
jobs:
|
||||||
validation:
|
validation:
|
||||||
name: "Validation"
|
name: "Validation"
|
||||||
# Don't run in the merge queue again if the branch is up to date with `develop`
|
|
||||||
if: github.event.merge_group.base_ref != 'refs/heads/develop'
|
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
# No concurrency required, this is a prerequisite to other actions and should run every time.
|
# No concurrency required, this is a prerequisite to other actions and should run every time.
|
||||||
steps:
|
steps:
|
||||||
|
|||||||
@@ -16,8 +16,6 @@ jobs:
|
|||||||
checkScript:
|
checkScript:
|
||||||
name: Search for forbidden patterns
|
name: Search for forbidden patterns
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
# Don't run in the merge queue again if the branch is up to date with `develop`
|
|
||||||
if: github.event.merge_group.base_ref != 'refs/heads/develop'
|
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v3
|
- uses: actions/checkout@v3
|
||||||
- name: Run code quality check suite
|
- name: Run code quality check suite
|
||||||
@@ -26,8 +24,6 @@ jobs:
|
|||||||
check:
|
check:
|
||||||
name: Project Check Suite
|
name: Project Check Suite
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
# Don't run in the merge queue again if the branch is up to date with `develop`
|
|
||||||
if: github.event.merge_group.base_ref != 'refs/heads/develop'
|
|
||||||
# Allow all jobs on main and develop. Just one per PR.
|
# Allow all jobs on main and develop. Just one per PR.
|
||||||
concurrency:
|
concurrency:
|
||||||
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) }}
|
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) }}
|
||||||
|
|||||||
@@ -16,8 +16,6 @@ jobs:
|
|||||||
sonar:
|
sonar:
|
||||||
name: Project Check Suite
|
name: Project Check Suite
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
# Don't run in the merge queue again if the branch is up to date with `develop`
|
|
||||||
if: github.event.merge_group.base_ref != 'refs/heads/develop'
|
|
||||||
# Allow all jobs on main and develop. Just one per PR.
|
# Allow all jobs on main and develop. Just one per PR.
|
||||||
concurrency:
|
concurrency:
|
||||||
group: ${{ github.ref == 'refs/heads/main' && format('sonar-main-{0}', github.sha) || github.ref == 'refs/heads/develop' && format('sonar-develop-{0}', github.sha) || format('sonar-{0}', github.ref) }}
|
group: ${{ github.ref == 'refs/heads/main' && format('sonar-main-{0}', github.sha) || github.ref == 'refs/heads/develop' && format('sonar-develop-{0}', github.sha) || format('sonar-{0}', github.ref) }}
|
||||||
|
|||||||
@@ -16,8 +16,6 @@ jobs:
|
|||||||
tests:
|
tests:
|
||||||
name: Runs unit tests
|
name: Runs unit tests
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
# Don't run in the merge queue again if the branch is up to date with `develop`
|
|
||||||
if: github.event.merge_group.base_ref != 'refs/heads/develop'
|
|
||||||
|
|
||||||
# Allow all jobs on main and develop. Just one per PR.
|
# Allow all jobs on main and develop. Just one per PR.
|
||||||
concurrency:
|
concurrency:
|
||||||
|
|||||||
@@ -5,8 +5,6 @@ on: [pull_request, merge_group]
|
|||||||
jobs:
|
jobs:
|
||||||
build:
|
build:
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
# Don't run in the merge queue again if the branch is up to date with `develop`
|
|
||||||
if: github.event.merge_group.base_ref != 'refs/heads/develop'
|
|
||||||
name: Validate
|
name: Validate
|
||||||
steps:
|
steps:
|
||||||
- uses: nschloe/action-cached-lfs-checkout@v1.2.1
|
- uses: nschloe/action-cached-lfs-checkout@v1.2.1
|
||||||
|
|||||||
Reference in New Issue
Block a user