From 9ac132a79673e61fee4d641a779f5c3c480ef518 Mon Sep 17 00:00:00 2001 From: Bjorn Neergaard Date: Sun, 24 Mar 2024 15:53:13 -0600 Subject: [PATCH] ci: enable merge queues (#9232) --- .github/workflows/backport.yaml | 2 +- .github/workflows/tests.yaml | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/backport.yaml b/.github/workflows/backport.yaml index 1fa4acbc814..3b52107b140 100644 --- 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 index 87ff9f92388..07b1d0f58ab 100644 --- 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/**'