From ccacb118a1dfba3864bd30000d1c831d5d04ade7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jorge=20Mart=C3=ADn?= Date: Thu, 17 Aug 2023 17:17:03 +0200 Subject: [PATCH] Revert merge queue CI optimizations --- .github/workflows/build.yml | 4 ++-- .github/workflows/danger.yml | 2 -- .github/workflows/gradle-wrapper-validation.yml | 2 -- .github/workflows/quality.yml | 4 ---- .github/workflows/sonar.yml | 2 -- .github/workflows/tests.yml | 2 -- .github/workflows/validate-lfs.yml | 2 -- 7 files changed, 2 insertions(+), 16 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 9579e81997..faeef544d1 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -16,8 +16,8 @@ jobs: debug: name: Build APKs runs-on: ubuntu-latest - # Skip for `main` and the merge queue if the branch is up to date with `develop` - if: github.ref != 'refs/heads/main' && github.event.merge_group.base_ref != 'refs/heads/develop' + # Skip for `main` + if: github.ref != 'refs/heads/main' strategy: matrix: variant: [debug, release, nightly, samples] diff --git a/.github/workflows/danger.yml b/.github/workflows/danger.yml index 4d997ec632..8551cb44c0 100644 --- a/.github/workflows/danger.yml +++ b/.github/workflows/danger.yml @@ -5,8 +5,6 @@ on: [pull_request, merge_group] jobs: build: 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 steps: - uses: actions/checkout@v3 diff --git a/.github/workflows/gradle-wrapper-validation.yml b/.github/workflows/gradle-wrapper-validation.yml index c1e478b15c..271c5399f6 100644 --- a/.github/workflows/gradle-wrapper-validation.yml +++ b/.github/workflows/gradle-wrapper-validation.yml @@ -8,8 +8,6 @@ on: jobs: 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 # No concurrency required, this is a prerequisite to other actions and should run every time. steps: diff --git a/.github/workflows/quality.yml b/.github/workflows/quality.yml index 1efa0ae215..6718376704 100644 --- a/.github/workflows/quality.yml +++ b/.github/workflows/quality.yml @@ -16,8 +16,6 @@ jobs: checkScript: name: Search for forbidden patterns 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: - uses: actions/checkout@v3 - name: Run code quality check suite @@ -26,8 +24,6 @@ jobs: check: name: Project Check Suite 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. 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) }} diff --git a/.github/workflows/sonar.yml b/.github/workflows/sonar.yml index 24e5b5ad9b..7b09a496a4 100644 --- a/.github/workflows/sonar.yml +++ b/.github/workflows/sonar.yml @@ -16,8 +16,6 @@ jobs: sonar: name: Project Check Suite 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. 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) }} diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 97a739f747..5eece16f26 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -16,8 +16,6 @@ jobs: tests: name: Runs unit tests 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. concurrency: diff --git a/.github/workflows/validate-lfs.yml b/.github/workflows/validate-lfs.yml index 63ded8f4e1..b1d6d8af6f 100644 --- a/.github/workflows/validate-lfs.yml +++ b/.github/workflows/validate-lfs.yml @@ -5,8 +5,6 @@ on: [pull_request, merge_group] jobs: build: 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 steps: - uses: nschloe/action-cached-lfs-checkout@v1.2.1