Skip to content

Commit

Permalink
Simplify glob pattern (#2569)
Browse files Browse the repository at this point in the history
  • Loading branch information
trask authored Feb 17, 2025
1 parent 54a8f80 commit 0112893
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 10 deletions.
12 changes: 6 additions & 6 deletions assets.md
Original file line number Diff line number Diff line change
Expand Up @@ -346,11 +346,11 @@ This GitHub App addresses two common issues:
```

It is recommended to push to branch names that start with `otelbot/`, and to add a branch protection
rule for `otelbot/**/**` with the same setup as documented for
[`dependabot/**/**`](docs/how-to-configure-new-repository.md#branch-protection-rule-dependabot).
rule for `otelbot/**/*` with the same setup as documented for
[`dependabot/**/*`](docs/how-to-configure-new-repository.md#branch-protection-rule-dependabot).

> [!WARNING]
> Branch protection rule **ordering** matters, so you will need to delete the `**/**` branch protection rule temporarily, then add the `otelbot/**/**` branch protection rule, then add back the `**/**` branch protection rule.
> Branch protection rule **ordering** matters, so you will need to delete the `**/**` branch protection rule temporarily, then add the `otelbot/**/*` branch protection rule, then add back the `**/**` branch protection rule.
2. When you use the built-in `secrets.GITHUB_TOKEN` to generate a pull request from inside a [GitHub Action], workflows
will not run on that new pull request without closing and re-opening it manually (this limitation is in place to
Expand Down Expand Up @@ -409,9 +409,9 @@ The OpenTelemetry Bot addresses two common issues:
```

It is recommended to push to branch names that start with `opentelemetrybot/`, and to add a branch protection
rule for `opentelemetrybot/**/**` with the same setup as documented for
[`dependabot/**/**`](docs/how-to-configure-new-repository.md#branch-protection-rule-dependabot). Note that branch protection rule ordering matters, so you will need to
delete the `**/**` branch protection rule temporarily, then add the `opentelemetrybot/**/**` branch protection
rule for `opentelemetrybot/**/*` with the same setup as documented for
[`dependabot/**/*`](docs/how-to-configure-new-repository.md#branch-protection-rule-dependabot). Note that branch protection rule ordering matters, so you will need to
delete the `**/**` branch protection rule temporarily, then add the `opentelemetrybot/**/*` branch protection
rule, then add back the `**/**` branch protection rule.

2. When you use the built-in `secrets.GITHUB_TOKEN` to generate a pull request from inside of a GitHub Action, workflows
Expand Down
8 changes: 4 additions & 4 deletions docs/how-to-configure-new-repository.md
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ Everything not mentioned is unchecked.
[Jira ticket](https://jira.linuxfoundation.org/plugins/servlet/desk/portal/4/create/143)
with the EasyCLA team.

#### Branch protection rule: `dependabot/**/**`
#### Branch protection rule: `dependabot/**/*`

Everything not mentioned is unchecked.

Expand All @@ -122,9 +122,9 @@ Everything not mentioned is unchecked.
"Require status checks to pass before merging" both need to be `unchecked` so that
these branches can be directly updated (without going through a pull request).

#### Branch protection rule: `renovate/**/**`
#### Branch protection rule: `renovate/**/*`

Same as for [`dependabot/**/**`](#branch-protection-rule-dependabot) above.
Same as for [`dependabot/**/*`](#branch-protection-rule-dependabot) above.

This branch protection rule is not set up automatically, but can be added for any
repositories that are using [Renovate](https://github.com/apps/renovate).
Expand Down Expand Up @@ -152,7 +152,7 @@ Option 1:

#### Branch protection rule: `gh-readonly-queue/main/**`

Same as for [`dependabot/**/**`](#branch-protection-rule-dependabot) above.
Same as for [`dependabot/**/*`](#branch-protection-rule-dependabot) above.

This branch protection rule is not set up automatically, but can be added for any
repositories that are using merge queues.
Expand Down

0 comments on commit 0112893

Please sign in to comment.