From cadf294052df45f9c5060cf6aba8c3f5092aba8b Mon Sep 17 00:00:00 2001 From: Andy Jordan <2226434+andschwa@users.noreply.github.com> Date: Wed, 12 Jul 2023 11:07:34 -0700 Subject: [PATCH] Setup GitHub merge queue (#2045) --- .github/workflows/codeql-analysis.yml | 2 ++ .github/workflows/emacs-test.yml | 2 ++ .github/workflows/vim-test.yml | 2 ++ .vsts-ci/azure-pipelines-ci.yml | 9 ++++++++- .vsts-ci/misc-analysis.yml | 11 +++++------ 5 files changed, 19 insertions(+), 7 deletions(-) diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index fcc2596789..f5045aacca 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -8,6 +8,8 @@ on: # The branches below must be a subset of the branches above branches: [ main ] paths-ignore: [ '**/*.md' ] + merge_group: + types: [ checks_requested ] schedule: - cron: '00 14 * * *' # Every morning at 7:00am PDT diff --git a/.github/workflows/emacs-test.yml b/.github/workflows/emacs-test.yml index d244a16a2d..338b7c1b7b 100644 --- a/.github/workflows/emacs-test.yml +++ b/.github/workflows/emacs-test.yml @@ -8,6 +8,8 @@ on: # The branches below must be a subset of the branches above branches: [ main ] paths-ignore: [ '**/*.md' ] + merge_group: + types: [ checks_requested ] jobs: test: diff --git a/.github/workflows/vim-test.yml b/.github/workflows/vim-test.yml index 387a98e001..e529f3b14f 100644 --- a/.github/workflows/vim-test.yml +++ b/.github/workflows/vim-test.yml @@ -8,6 +8,8 @@ on: # The branches below must be a subset of the branches above branches: [ main ] paths-ignore: [ '**/*.md' ] + merge_group: + types: [ checks_requested ] jobs: test: diff --git a/.vsts-ci/azure-pipelines-ci.yml b/.vsts-ci/azure-pipelines-ci.yml index c76a32ba31..64f10d89f9 100644 --- a/.vsts-ci/azure-pipelines-ci.yml +++ b/.vsts-ci/azure-pipelines-ci.yml @@ -1,4 +1,11 @@ -name: PR-$(System.PullRequest.PullRequestNumber)-$(Date:yyyyMMdd)$(Rev:.rr) +name: CI-$(Build.SourceBranchName)-$(Date:yyyyMMdd)$(Rev:.rr) + +trigger: + - gh-readonly-queue/main/* +pr: + paths: + exclude: + - '**/*.md' variables: # Don't download unneeded packages diff --git a/.vsts-ci/misc-analysis.yml b/.vsts-ci/misc-analysis.yml index 86b0b5840a..3c79fceecf 100644 --- a/.vsts-ci/misc-analysis.yml +++ b/.vsts-ci/misc-analysis.yml @@ -1,12 +1,11 @@ -name: PR-$(System.PullRequest.PullRequestNumber)-$(Date:yyyyMMdd)$(Rev:.rr) +name: Misc-$(Build.SourceBranchName)-$(Date:yyyyMMdd)$(Rev:.rr) trigger: - branches: - include: - - main - + - gh-readonly-queue/main/* pr: -- main + paths: + exclude: + - '**/*.md' resources: repositories: