@@ -340,7 +340,7 @@ jobs:
340340 uses : ./.github/actions/docker
341341 with :
342342 docker_service : ${{ needs.initialize.outputs.docker_service }}
343- is_pr : ${{ ( github.event_name == 'pull_request') }}
343+ is_pr : ${{ github.event_name == 'pull_request' || github.event_name == 'merge_group' }}
344344 docker_content_sha : ${{ needs.initialize.outputs.docker_content_sha }}
345345 github_token : ${{ secrets.GITHUB_TOKEN }}
346346 outputs :
@@ -363,7 +363,7 @@ jobs:
363363 uses : ./.github/actions/docker
364364 with :
365365 docker_service : unittest
366- is_pr : ${{ ( github.event_name == 'pull_request') }}
366+ is_pr : ${{ github.event_name == 'pull_request' || github.event_name == 'merge_group' }}
367367 docker_content_sha : ${{ needs.initialize.outputs.docker_content_sha }}
368368 github_token : ${{ secrets.GITHUB_TOKEN }}
369369 outputs :
@@ -386,7 +386,7 @@ jobs:
386386 uses : ./.github/actions/docker
387387 with :
388388 docker_service : webtest
389- is_pr : ${{ ( github.event_name == 'pull_request') }}
389+ is_pr : ${{ github.event_name == 'pull_request' || github.event_name == 'merge_group' }}
390390 docker_content_sha : ${{ needs.initialize.outputs.docker_content_sha }}
391391 github_token : ${{ secrets.GITHUB_TOKEN }}
392392 outputs :
@@ -463,7 +463,10 @@ jobs:
463463 # Set fetch-depth to 2 to make checkout faster for pull requests and cobalt_sandbox repo.
464464 # Set fetch-dept to 0 for non pull request workflows in production repo which is needed
465465 # to properly calculate build id.
466- fetch_depth : ${{ ( github.event_name == 'pull_request' || github.repository == 'youtube/cobalt_sandbox' ) && 2 || 0 }}
466+ fetch_depth : >-
467+ ${{ (github.event_name == 'pull_request' ||
468+ github.event_name == 'merge_group' ||
469+ github.repository == 'youtube/cobalt_sandbox') && 2 || 0 }}
467470 use_cache : true
468471
469472 - name : Set Up Depot Tools
@@ -511,7 +514,8 @@ jobs:
511514 if : |
512515 needs.initialize.outputs.test_on_device == 'true' &&
513516 (
514- (github.event_name == 'pull_request' && github.event.pull_request.draft == false ) ||
517+ (github.event_name == 'pull_request' && github.event.pull_request.draft == false) ||
518+ github.event_name == 'merge_group' ||
515519 ((inputs.nightly == 'true' || github.event_name == 'schedule') && vars.RUN_ODT_TESTS_ON_NIGHTLY != 'False') ||
516520 (github.event_name == 'push' && vars.RUN_ODT_TESTS_ON_POSTSUBMIT != 'False')
517521 )
@@ -560,7 +564,8 @@ jobs:
560564 if : |
561565 needs.initialize.outputs.test_e2e == 'true' &&
562566 (
563- (github.event_name == 'pull_request' && github.event.pull_request.draft == false ) ||
567+ (github.event_name == 'pull_request' && github.event.pull_request.draft == false) ||
568+ github.event_name == 'merge_group' ||
564569 ((inputs.nightly == 'true' || github.event_name == 'schedule') && vars.RUN_ODT_TESTS_ON_NIGHTLY != 'False') ||
565570 (github.event_name == 'push' && vars.RUN_ODT_TESTS_ON_POSTSUBMIT != 'False')
566571 )
@@ -595,7 +600,8 @@ jobs:
595600 if : |
596601 needs.initialize.outputs.test_yts == 'true' &&
597602 (
598- (github.event_name == 'pull_request' && github.event.pull_request.draft == false ) ||
603+ (github.event_name == 'pull_request' && github.event.pull_request.draft == false) ||
604+ github.event_name == 'merge_group' ||
599605 ((inputs.nightly == 'true' || github.event_name == 'schedule') && vars.RUN_ODT_TESTS_ON_NIGHTLY != 'False') ||
600606 (github.event_name == 'push' && vars.RUN_ODT_TESTS_ON_POSTSUBMIT != 'False')
601607 )
@@ -658,6 +664,7 @@ jobs:
658664 needs.initialize.outputs.test_on_host == 'true' &&
659665 (
660666 github.event_name == 'pull_request' ||
667+ github.event_name == 'merge_group' ||
661668 ((inputs.nightly == 'true' || github.event_name == 'schedule') && vars.RUN_ODT_TESTS_ON_NIGHTLY != 'False') ||
662669 (github.event_name == 'push' && vars.RUN_ODT_TESTS_ON_POSTSUBMIT != 'False')
663670 )
@@ -815,7 +822,10 @@ jobs:
815822 with :
816823 path : cobalt/src
817824 ref : ${{ github.sha }}
818- fetch_depth : ${{ ( github.event_name == 'pull_request' || github.repository == 'youtube/cobalt_sandbox' ) && 2 || 0 }}
825+ fetch_depth : >-
826+ ${{ (github.event_name == 'pull_request' ||
827+ github.event_name == 'merge_group' ||
828+ github.repository == 'youtube/cobalt_sandbox') && 2 || 0 }}
819829 use_cache : true
820830
821831 - name : Set Up Depot Tools
0 commit comments