From d9f48505fec88940025e6844cc541e84ffbff6dd Mon Sep 17 00:00:00 2001 From: Rob Bradford Date: Wed, 28 Feb 2024 09:49:28 +0000 Subject: [PATCH] build: Ensure all required checks run on merge_group And clean up some of the whitespace formatting so that the "name" and "on" are grouped away from the "jobs". Signed-off-by: Rob Bradford --- .github/workflows/audit.yaml | 1 + .github/workflows/build.yaml | 3 +-- .github/workflows/dco.yaml | 4 ++-- .github/workflows/docker-image.yaml | 1 - .github/workflows/fuzz-build.yaml | 3 +-- .github/workflows/gitlint.yaml | 1 - .github/workflows/hadolint.yaml | 1 - .github/workflows/integration-arm64.yaml | 3 +-- .github/workflows/integration-windows.yaml | 2 +- .github/workflows/integration-x86-64.yaml | 3 +-- .github/workflows/openapi.yaml | 4 +--- .github/workflows/quality.yaml | 3 +-- .github/workflows/release.yaml | 4 ++-- .github/workflows/shlint.yaml | 2 +- 14 files changed, 13 insertions(+), 22 deletions(-) diff --git a/.github/workflows/audit.yaml b/.github/workflows/audit.yaml index 4490bd133..3aa6724b8 100644 --- a/.github/workflows/audit.yaml +++ b/.github/workflows/audit.yaml @@ -4,6 +4,7 @@ on: paths: - '**/Cargo.toml' - '**/Cargo.lock' + jobs: security_audit: name: Audit diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index d964511fa..06848a163 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -1,9 +1,8 @@ name: Cloud Hypervisor Build -on: [pull_request, create] +on: [pull_request, merge_group] jobs: build: - if: github.event_name == 'pull_request' name: Build runs-on: ubuntu-latest strategy: diff --git a/.github/workflows/dco.yaml b/.github/workflows/dco.yaml index cd742f978..11fb11d18 100644 --- a/.github/workflows/dco.yaml +++ b/.github/workflows/dco.yaml @@ -1,6 +1,6 @@ name: DCO -on: - pull_request: +on: [pull_request, merge_group] + jobs: check: runs-on: ubuntu-latest diff --git a/.github/workflows/docker-image.yaml b/.github/workflows/docker-image.yaml index 5c6bac640..03f545b86 100644 --- a/.github/workflows/docker-image.yaml +++ b/.github/workflows/docker-image.yaml @@ -1,5 +1,4 @@ name: Cloud Hypervisor's Docker image update - on: push: branches: main diff --git a/.github/workflows/fuzz-build.yaml b/.github/workflows/fuzz-build.yaml index 324e28203..ba42a92df 100644 --- a/.github/workflows/fuzz-build.yaml +++ b/.github/workflows/fuzz-build.yaml @@ -1,9 +1,8 @@ name: Cloud Hypervisor Cargo Fuzz Build -on: [pull_request, create] +on: [pull_request, merge_group] jobs: build: - if: github.event_name == 'pull_request' name: Cargo Fuzz Build runs-on: ubuntu-latest strategy: diff --git a/.github/workflows/gitlint.yaml b/.github/workflows/gitlint.yaml index f7ee7c909..13fc8a583 100644 --- a/.github/workflows/gitlint.yaml +++ b/.github/workflows/gitlint.yaml @@ -1,5 +1,4 @@ name: Commit messages check - on: pull_request: diff --git a/.github/workflows/hadolint.yaml b/.github/workflows/hadolint.yaml index 464e42282..31b891098 100644 --- a/.github/workflows/hadolint.yaml +++ b/.github/workflows/hadolint.yaml @@ -1,5 +1,4 @@ name: Lint Dockerfile - on: push: paths: diff --git a/.github/workflows/integration-arm64.yaml b/.github/workflows/integration-arm64.yaml index ee13b7816..f21dfb23b 100644 --- a/.github/workflows/integration-arm64.yaml +++ b/.github/workflows/integration-arm64.yaml @@ -1,10 +1,9 @@ name: Cloud Hypervisor Tests (ARM64) -on: [pull_request, create] +on: [pull_request, merge_group] jobs: build: timeout-minutes: 60 - if: github.event_name == 'pull_request' name: Tests (ARM64) runs-on: focal-arm64 steps: diff --git a/.github/workflows/integration-windows.yaml b/.github/workflows/integration-windows.yaml index fcfdbd553..5c4540c38 100644 --- a/.github/workflows/integration-windows.yaml +++ b/.github/workflows/integration-windows.yaml @@ -1,5 +1,5 @@ name: Cloud Hypervisor Tests (Windows Guest) -on: [pull_request, create] +on: [merge_group] jobs: build: diff --git a/.github/workflows/integration-x86-64.yaml b/.github/workflows/integration-x86-64.yaml index 15204c82c..c571b3512 100644 --- a/.github/workflows/integration-x86-64.yaml +++ b/.github/workflows/integration-x86-64.yaml @@ -1,5 +1,5 @@ name: Cloud Hypervisor Tests (x86-64) -on: [pull_request, create] +on: [pull_request, merge_group] jobs: build: @@ -9,7 +9,6 @@ jobs: matrix: runner: ["garm-jammy", "garm-jammy-amd"] libc: ["musl", "gnu"] - if: github.event_name == 'pull_request' name: Tests (x86-64) runs-on: ${{ matrix.runner }} steps: diff --git a/.github/workflows/openapi.yaml b/.github/workflows/openapi.yaml index 42928ef58..0cd5b848c 100644 --- a/.github/workflows/openapi.yaml +++ b/.github/workflows/openapi.yaml @@ -1,7 +1,5 @@ name: Cloud Hypervisor OpenAPI Validation - -on: - pull_request: +on: [pull_request, merge_group] jobs: Validate: diff --git a/.github/workflows/quality.yaml b/.github/workflows/quality.yaml index 225f7e747..76bc22464 100644 --- a/.github/workflows/quality.yaml +++ b/.github/workflows/quality.yaml @@ -1,9 +1,8 @@ name: Cloud Hypervisor Quality Checks -on: [pull_request, create] +on: [pull_request, merge_group] jobs: build: - if: github.event_name == 'pull_request' name: Quality (clippy, rustfmt) runs-on: ubuntu-latest continue-on-error: ${{ matrix.experimental }} diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index c5c38134d..8c2d36a31 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -1,9 +1,9 @@ name: Cloud Hypervisor Release -on: [pull_request, create] +on: [pull_request, create, merge_group] jobs: release: - if: (github.event_name == 'create' && github.event.ref_type == 'tag') || github.event_name == 'pull_request' + if: (github.event_name == 'create' && github.event.ref_type == 'tag') || github.event_name == 'pull_request' || github.event_name == 'merge_group' name: Release runs-on: ubuntu-latest steps: diff --git a/.github/workflows/shlint.yaml b/.github/workflows/shlint.yaml index b1b78eb1f..9089964f0 100644 --- a/.github/workflows/shlint.yaml +++ b/.github/workflows/shlint.yaml @@ -1,7 +1,7 @@ name: Shell scripts check - on: pull_request: + merge_group: push: branches: - main