From 6e7f538aaef8a255f85d2cb543d142dc99444963 Mon Sep 17 00:00:00 2001 From: Jakub Nyckowski Date: Wed, 27 Sep 2023 19:20:56 -0400 Subject: [PATCH] An attempt to fix our failing builds (#32681) * An attempt to fix our failing builds * Add merge_group condition to checkout step in workflows This update adds a condition to the checkout step in various GitHub workflows to ensure it only runs when the event_name is "merge_group". * Fix syntax * Use v4 tag for checkout action instead of pinned commit Co-authored-by: Reed Loden --------- Co-authored-by: Reed Loden --- .github/workflows/aws-e2e-tests-non-root.yaml | 3 +++ .github/workflows/check-devbox.yaml | 3 +++ .github/workflows/doc-tests.yaml | 3 +++ .github/workflows/integration-tests-non-root.yaml | 3 +++ .github/workflows/unit-tests-integrations.yaml | 3 +++ 5 files changed, 15 insertions(+) diff --git a/.github/workflows/aws-e2e-tests-non-root.yaml b/.github/workflows/aws-e2e-tests-non-root.yaml index ef520e0b9598..88fab6e2ac66 100644 --- a/.github/workflows/aws-e2e-tests-non-root.yaml +++ b/.github/workflows/aws-e2e-tests-non-root.yaml @@ -29,6 +29,9 @@ jobs: outputs: changed: ${{ steps.changes.outputs.changed }} steps: + - name: Checkout + if: ${{ github.event_name == 'merge_group' }} + uses: actions/checkout@v4 - uses: dorny/paths-filter@4512585405083f25c027a35db413c2b3b9006d50 # v2.11.1 id: changes with: diff --git a/.github/workflows/check-devbox.yaml b/.github/workflows/check-devbox.yaml index 20b519637728..20cece8bfbb7 100644 --- a/.github/workflows/check-devbox.yaml +++ b/.github/workflows/check-devbox.yaml @@ -15,6 +15,9 @@ jobs: outputs: changed: ${{ steps.changes.outputs.changed }} steps: + - name: Checkout + if: ${{ github.event_name == 'merge_group' }} + uses: actions/checkout@v4 - uses: dorny/paths-filter@4512585405083f25c027a35db413c2b3b9006d50 # v2.11.1 id: changes with: diff --git a/.github/workflows/doc-tests.yaml b/.github/workflows/doc-tests.yaml index 890e3d555231..b980246c5026 100644 --- a/.github/workflows/doc-tests.yaml +++ b/.github/workflows/doc-tests.yaml @@ -15,6 +15,9 @@ jobs: outputs: changed: ${{ steps.changes.outputs.changed }} steps: + - name: Checkout + if: ${{ github.event_name == 'merge_group' }} + uses: actions/checkout@v4 - uses: dorny/paths-filter@4512585405083f25c027a35db413c2b3b9006d50 # v2.11.1 id: changes with: diff --git a/.github/workflows/integration-tests-non-root.yaml b/.github/workflows/integration-tests-non-root.yaml index 7acd49ab6bfc..1144fc22a2c6 100644 --- a/.github/workflows/integration-tests-non-root.yaml +++ b/.github/workflows/integration-tests-non-root.yaml @@ -15,6 +15,9 @@ jobs: outputs: changed: ${{ steps.changes.outputs.changed }} steps: + - name: Checkout + if: ${{ github.event_name == 'merge_group' }} + uses: actions/checkout@v4 - uses: dorny/paths-filter@4512585405083f25c027a35db413c2b3b9006d50 # v2.11.1 id: changes with: diff --git a/.github/workflows/unit-tests-integrations.yaml b/.github/workflows/unit-tests-integrations.yaml index d05612a192dd..34e7e254ded8 100644 --- a/.github/workflows/unit-tests-integrations.yaml +++ b/.github/workflows/unit-tests-integrations.yaml @@ -15,6 +15,9 @@ jobs: outputs: changed: ${{ steps.changes.outputs.changed }} steps: + - name: Checkout + if: ${{ github.event_name == 'merge_group' }} + uses: actions/checkout@v4 - uses: dorny/paths-filter@4512585405083f25c027a35db413c2b3b9006d50 # v2.11.1 id: changes with: