mirror of
https://github.com/discordeno/discordeno.git
synced 2026-09-17 08:47:22 +00:00
ci: add run e2e test on merge group (#2915)
This commit is contained in:
@@ -5,6 +5,7 @@ on:
|
||||
push:
|
||||
branches:
|
||||
- main
|
||||
merge_group:
|
||||
|
||||
jobs:
|
||||
build-type-and-test:
|
||||
@@ -139,7 +140,7 @@ jobs:
|
||||
bot-e2e-test:
|
||||
name: Bot
|
||||
needs: bot-unit-test
|
||||
if: ${{ github.ref == 'refs/heads/main' }}
|
||||
if: ${{ github.ref == 'refs/heads/main' || github.event_name == 'merge_group' }}
|
||||
uses: ./.github/workflows/e2e-test.yml
|
||||
secrets: inherit
|
||||
with:
|
||||
@@ -205,7 +206,7 @@ jobs:
|
||||
rest-e2e-test:
|
||||
name: Rest
|
||||
needs: rest-unit-test
|
||||
if: ${{ github.ref == 'refs/heads/main' }}
|
||||
if: ${{ github.ref == 'refs/heads/main' || github.event_name == 'merge_group' }}
|
||||
uses: ./.github/workflows/e2e-test.yml
|
||||
secrets: inherit
|
||||
with:
|
||||
|
||||
Reference in New Issue
Block a user