From 3629c9e4062f0de58c7c8ce9524e050621be3cb7 Mon Sep 17 00:00:00 2001 From: Pieter Noordhuis Date: Mon, 6 Jan 2025 17:07:15 +0100 Subject: [PATCH] Enable integration workflows (#2086) ## Changes This reverts commit 31552852ff6856a70f54454322d7407f6fdcfb06. These workflows were disabled in #2085. They should work again now that we're using self-hosted runners (see #2077). ## Tests (inline) --- .github/workflows/external-message.yml | 12 ++++-------- .github/workflows/integration-approve.yml | 6 +----- .github/workflows/integration-main.yml | 10 +++------- .github/workflows/integration-pr.yml | 8 ++------ 4 files changed, 10 insertions(+), 26 deletions(-) diff --git a/.github/workflows/external-message.yml b/.github/workflows/external-message.yml index eb68a36e4..f06d81a47 100644 --- a/.github/workflows/external-message.yml +++ b/.github/workflows/external-message.yml @@ -6,14 +6,10 @@ name: PR Comment # DO NOT PULL THE PR OR EXECUTE ANY CODE FROM THE PR. on: - workflow_dispatch: - - # Disable because of https://github.com/databricks/cli/issues/2084. - # - # pull_request_target: - # types: [opened, reopened, synchronize] - # branches: - # - main + pull_request_target: + types: [opened, reopened, synchronize] + branches: + - main jobs: comment-on-pr: diff --git a/.github/workflows/integration-approve.yml b/.github/workflows/integration-approve.yml index 0f6b209cb..293d31a2a 100644 --- a/.github/workflows/integration-approve.yml +++ b/.github/workflows/integration-approve.yml @@ -1,11 +1,7 @@ name: integration-approve on: - workflow_dispatch: - - # Disable because of https://github.com/databricks/cli/issues/2084. - # - # merge_group: + merge_group: jobs: # Trigger for merge groups. diff --git a/.github/workflows/integration-main.yml b/.github/workflows/integration-main.yml index 5a78d4fd8..0b6032d50 100644 --- a/.github/workflows/integration-main.yml +++ b/.github/workflows/integration-main.yml @@ -1,13 +1,9 @@ name: integration-main on: - workflow_dispatch: - - # Disable because of https://github.com/databricks/cli/issues/2084. - # - # push: - # branches: - # - main + push: + branches: + - main jobs: # Trigger for pushes to the main branch. diff --git a/.github/workflows/integration-pr.yml b/.github/workflows/integration-pr.yml index fd170f77e..0f9c4797a 100644 --- a/.github/workflows/integration-pr.yml +++ b/.github/workflows/integration-pr.yml @@ -1,12 +1,8 @@ name: integration-pr on: - workflow_dispatch: - - # Disable because of https://github.com/databricks/cli/issues/2084. - # - # pull_request: - # types: [opened, synchronize] + pull_request: + types: [opened, synchronize] jobs: # Trigger for pull requests.