From ca3e2849915ad3c6e2919c7528196870c6284643 Mon Sep 17 00:00:00 2001 From: Jorge Martin Espinosa Date: Mon, 31 Jul 2023 17:19:51 +0200 Subject: [PATCH] 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 --- .github/workflows/build.yml | 3 ++- .github/workflows/danger.yml | 1 + .github/workflows/gradle-wrapper-validation.yml | 1 + .github/workflows/quality.yml | 2 ++ .github/workflows/tests.yml | 1 + .github/workflows/validate-lfs.yml | 1 + 6 files changed, 8 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index b96e17a306..b06e3f1622 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -16,7 +16,7 @@ jobs: debug: name: Build debug APKs runs-on: ubuntu-latest - if: github.ref != 'refs/heads/main' + if: github.ref != 'refs/heads/main' && github.event.merge_group.base_ref != 'refs/heads/develop' strategy: fail-fast: false # Allow all jobs on develop. Just one per PR. @@ -24,6 +24,7 @@ jobs: group: ${{ github.ref == 'refs/heads/develop' && format('build-develop-{0}', github.sha) || format('build-debug-{0}', github.ref) }} cancel-in-progress: true steps: + - run: echo ${{ github.event.merge_group.base_ref }} - uses: actions/checkout@v3 with: # Ensure we are building the branch and not the branch after being merged on develop diff --git a/.github/workflows/danger.yml b/.github/workflows/danger.yml index cbc57274db..96e9d945b7 100644 --- a/.github/workflows/danger.yml +++ b/.github/workflows/danger.yml @@ -5,6 +5,7 @@ on: [pull_request, merge_group] jobs: build: runs-on: ubuntu-latest + 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 271c5399f6..55d9d45d6d 100644 --- a/.github/workflows/gradle-wrapper-validation.yml +++ b/.github/workflows/gradle-wrapper-validation.yml @@ -8,6 +8,7 @@ on: jobs: validation: name: "Validation" + 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 b4258627f0..f62b393e45 100644 --- a/.github/workflows/quality.yml +++ b/.github/workflows/quality.yml @@ -16,6 +16,7 @@ jobs: checkScript: name: Search for forbidden patterns runs-on: ubuntu-latest + if: github.event.merge_group.base_ref != 'refs/heads/develop' steps: - uses: actions/checkout@v3 - name: Run code quality check suite @@ -24,6 +25,7 @@ jobs: check: name: Project Check Suite runs-on: ubuntu-latest + 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/tests.yml b/.github/workflows/tests.yml index 5eece16f26..82e0708e64 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -16,6 +16,7 @@ jobs: tests: name: Runs unit tests runs-on: ubuntu-latest + 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 b1d6d8af6f..e7f5c04d9e 100644 --- a/.github/workflows/validate-lfs.yml +++ b/.github/workflows/validate-lfs.yml @@ -5,6 +5,7 @@ on: [pull_request, merge_group] jobs: build: runs-on: ubuntu-latest + if: github.event.merge_group.base_ref != 'refs/heads/develop' name: Validate steps: - uses: nschloe/action-cached-lfs-checkout@v1.2.1