From 830ef4721248e297ff2d469a5c8089f73f005846 Mon Sep 17 00:00:00 2001 From: Carter Anderson Date: Mon, 6 Mar 2023 17:01:12 -0800 Subject: [PATCH 1/2] Only run validation jobs in Merge Queues --- .github/workflows/validation-jobs.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.github/workflows/validation-jobs.yml b/.github/workflows/validation-jobs.yml index 280db966b10e0..b9eac8854f006 100644 --- a/.github/workflows/validation-jobs.yml +++ b/.github/workflows/validation-jobs.yml @@ -13,6 +13,7 @@ env: jobs: build-and-install-on-iOS: + if: ${{ github.event_name == 'merge_group' }} runs-on: macos-latest timeout-minutes: 30 steps: @@ -33,6 +34,7 @@ jobs: run: cd examples/mobile && make install build-android: + if: ${{ github.event_name == 'merge_group' }} runs-on: ubuntu-latest timeout-minutes: 30 steps: @@ -60,6 +62,7 @@ jobs: run: ANDROID_NDK_ROOT=$ANDROID_NDK_LATEST_HOME cargo apk build --package bevy_mobile_example run-examples-on-windows-dx12: + if: ${{ github.event_name == 'merge_group' }} runs-on: windows-latest timeout-minutes: 60 steps: @@ -94,6 +97,7 @@ jobs: done run-examples-on-wasm: + if: ${{ github.event_name == 'merge_group' }} runs-on: ubuntu-latest timeout-minutes: 60 steps: @@ -150,6 +154,7 @@ jobs: path: .github/start-wasm-example/screenshot-*.png build-without-default-features: + if: ${{ github.event_name == 'merge_group' }} timeout-minutes: 30 strategy: matrix: From da6d380f0585b856a7c887e835539da4bf0b8e5a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois?= Date: Tue, 7 Mar 2023 02:23:09 +0100 Subject: [PATCH 2/2] add pull_request event to validation job --- .github/workflows/validation-jobs.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/validation-jobs.yml b/.github/workflows/validation-jobs.yml index b9eac8854f006..ae79eb9838fda 100644 --- a/.github/workflows/validation-jobs.yml +++ b/.github/workflows/validation-jobs.yml @@ -2,6 +2,7 @@ name: validation jobs on: merge_group: + pull_request: push: branches: - staging