Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 14 additions & 0 deletions .asf.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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)"
1 change: 1 addition & 0 deletions .github/workflows/license.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ on:
branches:
- main
pull_request:
merge_group:
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.


jobs:

Expand Down
11 changes: 9 additions & 2 deletions .github/workflows/rust.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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/**'
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What is this for? Can we perhaps add some comments explaining what this branch ignore is for?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Added

pull_request:
merge_group:

permissions:
contents: read

jobs:

codestyle:
runs-on: ubuntu-latest
steps:
Expand Down
2 changes: 1 addition & 1 deletion src/keywords.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading