From 01128933b431e7fd6f867dba990581af90c2d54b Mon Sep 17 00:00:00 2001 From: Trask Stalnaker Date: Mon, 17 Feb 2025 08:09:27 -0800 Subject: [PATCH] Simplify glob pattern (#2569) --- assets.md | 12 ++++++------ docs/how-to-configure-new-repository.md | 8 ++++---- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/assets.md b/assets.md index b4dfd7f62..e6d9b7de9 100644 --- a/assets.md +++ b/assets.md @@ -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 @@ -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 diff --git a/docs/how-to-configure-new-repository.md b/docs/how-to-configure-new-repository.md index 9bede6d20..549b29040 100644 --- a/docs/how-to-configure-new-repository.md +++ b/docs/how-to-configure-new-repository.md @@ -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. @@ -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). @@ -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.