Skip to content

Commit

Permalink
ci: don't run jobs on main that already run on the merge queue (valor…
Browse files Browse the repository at this point in the history
…a-inc#5029)

Now that we have merge queue enabled for main, every PR runs checks at
least twice, once on the PR before being added to the queue and once on
the merge queue. The commit on the merge queue is the same commit that
lands on main, so we don't need to run checks again on main that have
already run on the merge queue (see image below on checks running twice
on commits on main). This disables `check` and `test` workflows on main,
and updates the `e2e-main` workflow to only run tests on OS that have
not already run on the merge queue. This should save us some CI time,
especially on E2E machines.

<img width="527" alt="image"
src="https://github.com/valora-inc/wallet/assets/5062591/68808134-8330-4975-9d85-0626050681d0">

CI

N/A

N/A

N/A
  • Loading branch information
satish-ravi authored and shottah committed May 15, 2024
1 parent 68edf25 commit 2f0cb05
Showing 1 changed file with 21 additions and 18 deletions.
39 changes: 21 additions & 18 deletions .github/workflows/e2e-main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,33 +18,36 @@ on:
# Cancel any in progress run of the workflow for a given PR
# This avoids building outdated code
concurrency:
group: ${{ github.workflow }}-${{ github.head_ref }}
group: ${{ github.workflow }}-${{ github.ref_name }}
cancel-in-progress: true

jobs:
android:
name: Android
strategy:
max-parallel: 2
fail-fast: false
matrix:
# TODO if/when more CI machines: enable Android sdk 21, 23, 29 and 31
# 21 is failing 9 specs
# 23 is failing ? spec(s)
# 31 is failing ? spec(s)
# 24 is currently failing all the time, disabling it for now
android-api-level: [30]
uses: ./.github/workflows/e2e-android.yml
with:
android-api-level: ${{ matrix.android-api-level }}
secrets: inherit
# TODO: enable once we have at least one android-api-level below
# android:
# name: Android
# strategy:
# max-parallel: 2
# fail-fast: false
# matrix:
# # TODO if/when more CI machines: enable Android sdk 21, 23, 29 and 31
# # 21 is failing 9 specs
# # 23 is failing ? spec(s)
# # 31 is failing ? spec(s)
# # 24 is currently failing all the time, disabling it for now
# # 30 is not included as it runs on the merge queue
# android-api-level: []
# uses: ./.github/workflows/e2e-android.yml
# with:
# android-api-level: ${{ matrix.android-api-level }}
# secrets: inherit
ios:
name: iOS
strategy:
max-parallel: 2
fail-fast: false
matrix:
ios-version: ['15.0', '17.2']
# 15.0 is not included as it runs on the merge queue
ios-version: ['17.2']
uses: ./.github/workflows/e2e-ios.yml
with:
ios-version: ${{ matrix.ios-version }}
Expand Down

0 comments on commit 2f0cb05

Please sign in to comment.