From 24fddcfc0bc1f820a7c5fdef2eb3fbd8ac2968e8 Mon Sep 17 00:00:00 2001 From: Andrea Angiolillo Date: Fri, 3 Nov 2023 14:39:33 +0000 Subject: [PATCH] chore: add acceptance tests and migration tests to report in merge queue (#1590) * chore: add acceptance tests and migration tests to report in merge queue * fix based on https://github.com/dorny/paths-filter/issues/183 * fix --- .github/workflows/acceptance-tests.yml | 3 +++ .github/workflows/migration-tests.yml | 3 +++ 2 files changed, 6 insertions(+) diff --git a/.github/workflows/acceptance-tests.yml b/.github/workflows/acceptance-tests.yml index 0dfc76054c..07f79c1335 100644 --- a/.github/workflows/acceptance-tests.yml +++ b/.github/workflows/acceptance-tests.yml @@ -11,6 +11,7 @@ on: type: string pull_request: # you can run a specic job in your PR using GitHub labels types: [ labeled ] + merge_group: # needed for merge queue jobs: change-detection: @@ -39,6 +40,8 @@ jobs: - uses: dorny/paths-filter@v2 id: filter with: + base: ${{ github.event.merge_group.base_ref}} + ref: ${{ github.event.merge_group.head_ref }} filters: | assume_role: - 'mongodbatlas/**provider**.go' diff --git a/.github/workflows/migration-tests.yml b/.github/workflows/migration-tests.yml index f8cfe61eae..1d795d8b80 100644 --- a/.github/workflows/migration-tests.yml +++ b/.github/workflows/migration-tests.yml @@ -9,6 +9,7 @@ on: type: string pull_request: types: [ labeled ] + merge_group: # needed for merge queue jobs: change-detection: @@ -27,6 +28,8 @@ jobs: - uses: dorny/paths-filter@v2 id: filter with: + base: ${{ github.event.merge_group.base_ref}} + ref: ${{ github.event.merge_group.head_ref }} filters: | project: - 'mongodbatlas/fw_data_source_mongodbatlas_project_ip_access_list*.go'