From 6f63181eee9d31cbc910f4a4c4d7eea3b2dd2f99 Mon Sep 17 00:00:00 2001 From: blaginin Date: Tue, 19 Aug 2025 23:22:49 +0100 Subject: [PATCH 1/4] Prepare Github Actions for Merge Queue --- .asf.yaml | 14 ++++++++++++++ .github/workflows/license.yml | 1 + .github/workflows/rust.yml | 8 ++++++-- 3 files changed, 21 insertions(+), 2 deletions(-) diff --git a/.asf.yaml b/.asf.yaml index 8ad476f123..05b5786e82 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 (wasm)" + - "rat" diff --git a/.github/workflows/license.yml b/.github/workflows/license.yml index c851bff31a..f4524f6b21 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 3abf9d387b..0b17cdd1eb 100644 --- a/.github/workflows/rust.yml +++ b/.github/workflows/rust.yml @@ -17,13 +17,17 @@ name: Rust -on: [push, pull_request] +on: + push: + branches-ignore: + - 'gh-readonly-queue/**' + pull_request: + merge_group: permissions: contents: read jobs: - codestyle: runs-on: ubuntu-latest steps: From 5f086782e50164f1b21d0bbff15f50d06adde24e Mon Sep 17 00:00:00 2001 From: blaginin Date: Tue, 19 Aug 2025 23:24:38 +0100 Subject: [PATCH 2/4] MQ Test --- src/keywords.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/keywords.rs b/src/keywords.rs index 659bc04399..817c534198 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 From c7c03beee59693b816de7d111f9ede20b7a86b19 Mon Sep 17 00:00:00 2001 From: blaginin Date: Tue, 19 Aug 2025 23:32:32 +0100 Subject: [PATCH 3/4] Fix names --- .asf.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.asf.yaml b/.asf.yaml index 05b5786e82..0534705bce 100644 --- a/.asf.yaml +++ b/.asf.yaml @@ -48,5 +48,5 @@ github: - "compile-no-std" - "test (stable)" - "test (beta)" - - "test (wasm)" - - "rat" + - "test (nightly)" + - "Release Audit Tool (RAT)" From 05655e953fb9b13ba203a7dcbbd26a43282cbe00 Mon Sep 17 00:00:00 2001 From: blaginin Date: Thu, 4 Sep 2025 21:12:57 +0100 Subject: [PATCH 4/4] Add a note on `branches-ignore` --- .github/workflows/rust.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml index 0b17cdd1eb..f96de9472b 100644 --- a/.github/workflows/rust.yml +++ b/.github/workflows/rust.yml @@ -19,6 +19,9 @@ name: Rust 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: