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 <rbradford@rivosinc.com>
This commit is contained in:
Rob Bradford 2024-02-28 09:49:28 +00:00
parent 1d098949b9
commit d9f48505fe
14 changed files with 13 additions and 22 deletions

View File

@ -4,6 +4,7 @@ on:
paths: paths:
- '**/Cargo.toml' - '**/Cargo.toml'
- '**/Cargo.lock' - '**/Cargo.lock'
jobs: jobs:
security_audit: security_audit:
name: Audit name: Audit

View File

@ -1,9 +1,8 @@
name: Cloud Hypervisor Build name: Cloud Hypervisor Build
on: [pull_request, create] on: [pull_request, merge_group]
jobs: jobs:
build: build:
if: github.event_name == 'pull_request'
name: Build name: Build
runs-on: ubuntu-latest runs-on: ubuntu-latest
strategy: strategy:

View File

@ -1,6 +1,6 @@
name: DCO name: DCO
on: on: [pull_request, merge_group]
pull_request:
jobs: jobs:
check: check:
runs-on: ubuntu-latest runs-on: ubuntu-latest

View File

@ -1,5 +1,4 @@
name: Cloud Hypervisor's Docker image update name: Cloud Hypervisor's Docker image update
on: on:
push: push:
branches: main branches: main

View File

@ -1,9 +1,8 @@
name: Cloud Hypervisor Cargo Fuzz Build name: Cloud Hypervisor Cargo Fuzz Build
on: [pull_request, create] on: [pull_request, merge_group]
jobs: jobs:
build: build:
if: github.event_name == 'pull_request'
name: Cargo Fuzz Build name: Cargo Fuzz Build
runs-on: ubuntu-latest runs-on: ubuntu-latest
strategy: strategy:

View File

@ -1,5 +1,4 @@
name: Commit messages check name: Commit messages check
on: on:
pull_request: pull_request:

View File

@ -1,5 +1,4 @@
name: Lint Dockerfile name: Lint Dockerfile
on: on:
push: push:
paths: paths:

View File

@ -1,10 +1,9 @@
name: Cloud Hypervisor Tests (ARM64) name: Cloud Hypervisor Tests (ARM64)
on: [pull_request, create] on: [pull_request, merge_group]
jobs: jobs:
build: build:
timeout-minutes: 60 timeout-minutes: 60
if: github.event_name == 'pull_request'
name: Tests (ARM64) name: Tests (ARM64)
runs-on: focal-arm64 runs-on: focal-arm64
steps: steps:

View File

@ -1,5 +1,5 @@
name: Cloud Hypervisor Tests (Windows Guest) name: Cloud Hypervisor Tests (Windows Guest)
on: [pull_request, create] on: [merge_group]
jobs: jobs:
build: build:

View File

@ -1,5 +1,5 @@
name: Cloud Hypervisor Tests (x86-64) name: Cloud Hypervisor Tests (x86-64)
on: [pull_request, create] on: [pull_request, merge_group]
jobs: jobs:
build: build:
@ -9,7 +9,6 @@ jobs:
matrix: matrix:
runner: ["garm-jammy", "garm-jammy-amd"] runner: ["garm-jammy", "garm-jammy-amd"]
libc: ["musl", "gnu"] libc: ["musl", "gnu"]
if: github.event_name == 'pull_request'
name: Tests (x86-64) name: Tests (x86-64)
runs-on: ${{ matrix.runner }} runs-on: ${{ matrix.runner }}
steps: steps:

View File

@ -1,7 +1,5 @@
name: Cloud Hypervisor OpenAPI Validation name: Cloud Hypervisor OpenAPI Validation
on: [pull_request, merge_group]
on:
pull_request:
jobs: jobs:
Validate: Validate:

View File

@ -1,9 +1,8 @@
name: Cloud Hypervisor Quality Checks name: Cloud Hypervisor Quality Checks
on: [pull_request, create] on: [pull_request, merge_group]
jobs: jobs:
build: build:
if: github.event_name == 'pull_request'
name: Quality (clippy, rustfmt) name: Quality (clippy, rustfmt)
runs-on: ubuntu-latest runs-on: ubuntu-latest
continue-on-error: ${{ matrix.experimental }} continue-on-error: ${{ matrix.experimental }}

View File

@ -1,9 +1,9 @@
name: Cloud Hypervisor Release name: Cloud Hypervisor Release
on: [pull_request, create] on: [pull_request, create, merge_group]
jobs: jobs:
release: 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 name: Release
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:

View File

@ -1,7 +1,7 @@
name: Shell scripts check name: Shell scripts check
on: on:
pull_request: pull_request:
merge_group:
push: push:
branches: branches:
- main - main