Skip to content

Commit 0112893

Browse files
authored
Simplify glob pattern (#2569)
1 parent 54a8f80 commit 0112893

File tree

2 files changed

+10
-10
lines changed

2 files changed

+10
-10
lines changed

assets.md

+6-6
Original file line numberDiff line numberDiff line change
@@ -346,11 +346,11 @@ This GitHub App addresses two common issues:
346346
```
347347

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

352352
> [!WARNING]
353-
> 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.
353+
> 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.
354354
355355
2. When you use the built-in `secrets.GITHUB_TOKEN` to generate a pull request from inside a [GitHub Action], workflows
356356
will not run on that new pull request without closing and re-opening it manually (this limitation is in place to
@@ -409,9 +409,9 @@ The OpenTelemetry Bot addresses two common issues:
409409
```
410410

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

417417
2. When you use the built-in `secrets.GITHUB_TOKEN` to generate a pull request from inside of a GitHub Action, workflows

docs/how-to-configure-new-repository.md

+4-4
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ Everything not mentioned is unchecked.
108108
[Jira ticket](https://jira.linuxfoundation.org/plugins/servlet/desk/portal/4/create/143)
109109
with the EasyCLA team.
110110

111-
#### Branch protection rule: `dependabot/**/**`
111+
#### Branch protection rule: `dependabot/**/*`
112112

113113
Everything not mentioned is unchecked.
114114

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

125-
#### Branch protection rule: `renovate/**/**`
125+
#### Branch protection rule: `renovate/**/*`
126126

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

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

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

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

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

0 commit comments

Comments
 (0)