ci: enable merge queues (#9232)

python-poetry · Mar 24, 2024 · 9ac132a · 9ac132a
1 parent 6b64023
commit 9ac132a
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/.github/workflows/backport.yaml b/.github/workflows/backport.yaml
@@ -24,7 +24,7 @@ jobs:
       - uses: actions/checkout@v4
       # This workflow requires a non-GHA token in order to trigger downstream CI, and to access the 'fork' repository.
       - id: app-token
-        uses: actions/create-github-app-token
+        uses: actions/create-github-app-token@v1
         with:
           app-id: ${{ secrets.POETRY_TOKEN_APP_ID }}
           private-key: ${{ secrets.POETRY_TOKEN_APP_KEY }}

diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml
@@ -3,6 +3,7 @@ name: Tests
 on:
   push:
   pull_request:
+  merge_group:
 
 concurrency:
   group: tests-${{ github.head_ref || github.ref }}
@@ -28,7 +29,7 @@ jobs:
         with:
           filters: |
             workflow: &workflow
-              - '.github/workflwos/tests.yaml'
+              - '.github/workflows/tests.yaml'
             fixtures-pypi:
               - *workflow
               - 'tests/repositories/fixtures/pypi.org/**'