From 68a1e3754b3770f59459b9fa2a3e270c57b0253c Mon Sep 17 00:00:00 2001 From: Andrea Angiolillo Date: Fri, 3 Nov 2023 14:42:50 +0000 Subject: [PATCH 1/2] Revert "chore: add acceptance tests and migration tests to report in merge queue (#1590)" This reverts commit 24fddcfc0bc1f820a7c5fdef2eb3fbd8ac2968e8. --- .github/workflows/acceptance-tests.yml | 3 --- .github/workflows/migration-tests.yml | 3 --- 2 files changed, 6 deletions(-) diff --git a/.github/workflows/acceptance-tests.yml b/.github/workflows/acceptance-tests.yml index 07f79c1335..0dfc76054c 100644 --- a/.github/workflows/acceptance-tests.yml +++ b/.github/workflows/acceptance-tests.yml @@ -11,7 +11,6 @@ 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: @@ -40,8 +39,6 @@ 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 1d795d8b80..f8cfe61eae 100644 --- a/.github/workflows/migration-tests.yml +++ b/.github/workflows/migration-tests.yml @@ -9,7 +9,6 @@ on: type: string pull_request: types: [ labeled ] - merge_group: # needed for merge queue jobs: change-detection: @@ -28,8 +27,6 @@ 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' From b5839d099d8e7960879cabc4fb3cfbca06e37219 Mon Sep 17 00:00:00 2001 From: andreaangiolillo Date: Fri, 3 Nov 2023 14:45:01 +0000 Subject: [PATCH 2/2] Update code-health.yml --- .github/workflows/code-health.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/code-health.yml b/.github/workflows/code-health.yml index 9c84f443bb..f81b710897 100644 --- a/.github/workflows/code-health.yml +++ b/.github/workflows/code-health.yml @@ -10,7 +10,6 @@ on: - 'LICENSE' pull_request: {} workflow_dispatch: {} - merge_group: jobs: build: