Merge pull request #1071 from vector-im/chore/jme/revert-merge-queue-…

…optimizations Revert merge queue CI optimizations
element-hq · Aug 17, 2023 · cd11790 · cd11790
2 parents 959e8d4 + ccacb11
commit cd11790
Show file tree

Hide file tree

Showing 7 changed files with 2 additions and 16 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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.2