diff --git a/.asf.yaml b/.asf.yaml index 8ad476f1..0534705b 100644 --- a/.asf.yaml +++ b/.asf.yaml @@ -36,3 +36,17 @@ github: rebase: false features: issues: true + protected_branches: + main: + required_status_checks: + contexts: + - "codestyle" + - "lint" + - "benchmark-lint" + - "compile" + - "docs" + - "compile-no-std" + - "test (stable)" + - "test (beta)" + - "test (nightly)" + - "Release Audit Tool (RAT)" diff --git a/.github/workflows/license.yml b/.github/workflows/license.yml index c851bff3..f4524f6b 100644 --- a/.github/workflows/license.yml +++ b/.github/workflows/license.yml @@ -23,6 +23,7 @@ on: branches: - main pull_request: + merge_group: jobs: diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml index 3abf9d38..f96de947 100644 --- a/.github/workflows/rust.yml +++ b/.github/workflows/rust.yml @@ -17,13 +17,20 @@ name: Rust -on: [push, pull_request] +on: + push: + # When PR is in the Merge Queue, GitHub will create a temporary branch - but we already have a + # CI running because of `merge_group` + # https://github.com/orgs/community/discussions/15254 + branches-ignore: + - 'gh-readonly-queue/**' + pull_request: + merge_group: permissions: contents: read jobs: - codestyle: runs-on: ubuntu-latest steps: diff --git a/src/keywords.rs b/src/keywords.rs index e955cd97..3358e284 100644 --- a/src/keywords.rs +++ b/src/keywords.rs @@ -15,7 +15,7 @@ // specific language governing permissions and limitations // under the License. -//! This module defines +//! This module defines: //! 1) a list of constants for every keyword //! 2) an `ALL_KEYWORDS` array with every keyword in it //! This is not a list of *reserved* keywords: some of these can be