Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Branch protection settings dont work for wildcards #329

Closed
lukekarrys opened this issue Jul 7, 2023 · 2 comments · Fixed by #330
Closed

Branch protection settings dont work for wildcards #329

lukekarrys opened this issue Jul 7, 2023 · 2 comments · Fixed by #330

Comments

@lukekarrys
Copy link
Contributor

Our release branches follow the pattern release/v* but this doesn't work with Probot + .github/settings.yml. Ref: repository-settings/app#227 (comment)

Possible solutions:

  • generate branch protection rules for possible release branch explicitly release/v[1-30]. This would clutter the web UI for branch protections.
  • manually configure branch protections for each actual release branch. Tradeoffs: error prone and possible to forget or misconfigure some settings
  • Require configuration in template-oss for each required release branch. Less error prone, but still possible to forget.
@wraithgar wraithgar changed the title Branch protection settings dont work for wilcards Branch protection settings dont work for wildcards Jul 8, 2023
@wraithgar
Copy link
Member

The third option seems like the one that leaves us open to configuring what versions we backport in template-oss itself.

lukekarrys added a commit that referenced this issue Jul 8, 2023
@lukekarrys
fix: use git remote for branches
8180172 
Fixes #329
@lukekarrys lukekarrys mentioned this issue Jul 8, 2023
Merged
lukekarrys added a commit that referenced this issue Jul 9, 2023
@lukekarrys
feat: use git remote for branch related config
2c7aadf 
This will check the origin remote if it exists and use that to determine
which branches exist. These branches are then used to populate CI
branches, branch protections, and dependabot.

Using this for dependabot is a new feature which allows old release
branches to get dependency updates for template-oss only.

Fixes #329
lukekarrys added a commit that referenced this issue Jul 9, 2023
@lukekarrys
feat: use git remote for branch related config
80c0969 
This will check the origin remote if it exists and use that to determine
which branches exist. These branches are then used to populate CI
branches, branch protections, and dependabot.

Using this for dependabot is a new feature which allows old release
branches to get dependency updates for template-oss only.

Fixes #329
lukekarrys added a commit that referenced this issue Jul 9, 2023
@lukekarrys
feat: use git remote for branch related config
8dc0546 
This will check the origin remote if it exists and use that to determine
which branches exist. These branches are then used to populate CI
branches, branch protections, and dependabot.

Using this for dependabot is a new feature which allows old release
branches to get dependency updates for template-oss only.

This also updates the dependabot config to only update the root
directory instead of each workspace directory. The previous way was an
attempt to get it to work with workspaces, but wasn't used in any our
repos. Dependabot should now be able to update workspaces when
configured to use a single root directory.

Fixes #329
@lukekarrys
Copy link
Contributor Author

A version will only be back ported if template oss is installed on that branch. But we still want to protect those branches regardless, and branch protections are only created from the settings file on the default branch.

I came up with a solution in the linked PR which uses info from the git remote which I think works pretty well.

lukekarrys added a commit that referenced this issue Jul 9, 2023
@lukekarrys
feat: use git remote for branch related config
c4ee7ef 
This will check the origin remote if it exists and use that to determine
which branches exist. These branches are then used to populate CI
branches, branch protections, and dependabot.

Using this for dependabot is a new feature which allows old release
branches to get dependency updates for template-oss only.

This also updates the dependabot config to only update the root
directory instead of each workspace directory. The previous way was an
attempt to get it to work with workspaces, but wasn't used in any our
repos. Dependabot should now be able to update workspaces when
configured to use a single root directory.

Fixes #329
lukekarrys added a commit that referenced this issue Jul 9, 2023
@lukekarrys
feat: use git remote for branch related config
d292a8b 
This will check the origin remote if it exists and use that to determine
which branches exist. These branches are then used to populate CI
branches, branch protections, and dependabot.

Using this for dependabot is a new feature which allows old release
branches to get dependency updates for template-oss only.

This also updates the dependabot config to only update the root
directory instead of each workspace directory. The previous way was an
attempt to get it to work with workspaces, but wasn't used in any our
repos. Dependabot should now be able to update workspaces when
configured to use a single root directory.

Fixes #329
lukekarrys added a commit that referenced this issue Jul 10, 2023
@lukekarrys
feat: use git remote for branch related config
d68ad53 
This will check the origin remote if it exists and use that to determine
which branches exist. These branches are then used to populate CI
branches, branch protections, and dependabot.

Using this for dependabot is a new feature which allows old release
branches to get dependency updates for template-oss only.

This also updates the dependabot config to only update the root
directory instead of each workspace directory. The previous way was an
attempt to get it to work with workspaces, but wasn't used in any our
repos. Dependabot should now be able to update workspaces when
configured to use a single root directory.

Fixes #329
lukekarrys added a commit that referenced this issue Jul 10, 2023
@lukekarrys
feat: use git remote for branch related config
d50eee3 
This will check the origin remote if it exists and use that to determine
which branches exist. These branches are then used to populate CI
branches, branch protections, and dependabot.

Using this for dependabot is a new feature which allows old release
branches to get dependency updates for template-oss only.

This also updates the dependabot config to only update the root
directory instead of each workspace directory. The previous way was an
attempt to get it to work with workspaces, but wasn't used in any our
repos. Dependabot should now be able to update workspaces when
configured to use a single root directory.

Fixes #329
lukekarrys added a commit that referenced this issue Jul 10, 2023
@lukekarrys
feat: use git remote for branch related config
a7ac2df 
This will check the origin remote if it exists and use that to determine
which branches exist. These branches are then used to populate CI
branches, branch protections, and dependabot.

Using this for dependabot is a new feature which allows old release
branches to get dependency updates for template-oss only.

This also updates the dependabot config to only update the root
directory instead of each workspace directory. The previous way was an
attempt to get it to work with workspaces, but wasn't used in any our
repos. Dependabot should now be able to update workspaces when
configured to use a single root directory.

Fixes #329
lukekarrys added a commit that referenced this issue Jul 10, 2023
@lukekarrys
feat: use git remote for branch related config
f04a76d 
This will check the origin remote if it exists and use that to determine
which branches exist. These branches are then used to populate CI
branches, branch protections, and dependabot.

Using this for dependabot is a new feature which allows old release
branches to get dependency updates for template-oss only.

This also updates the dependabot config to only update the root
directory instead of each workspace directory. The previous way was an
attempt to get it to work with workspaces, but wasn't used in any our
repos. Dependabot should now be able to update workspaces when
configured to use a single root directory.

Fixes #329
lukekarrys added a commit that referenced this issue Jul 10, 2023
@lukekarrys
feat: use git remote for branch related config
3aa4591 
This will check the origin remote if it exists and use that to determine
which branches exist. These branches are then used to populate CI
branches, branch protections, and dependabot.

Using this for dependabot is a new feature which allows old release
branches to get dependency updates for template-oss only.

This also updates the dependabot config to only update the root
directory instead of each workspace directory. The previous way was an
attempt to get it to work with workspaces, but wasn't used in any our
repos. Dependabot should now be able to update workspaces when
configured to use a single root directory.

Fixes #329
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging a pull request may close this issue.

feat: use git remote for branch related config npm/template-oss
2 participants
@wraithgar @lukekarrys