fix #3661 chore(project): Dependabot PR against main (#3662)

Because

* We're experimenting with disabling main branch protections
* And can use a few more circle credits

This commit

* Configures dependabot to PR against main
This commit is contained in:
Jared Lockhart 2020-10-05 13:29:19 -04:00 коммит произвёл GitHub
Родитель d37fab4ae9
Коммит 420b670d2a
Не найден ключ, соответствующий данной подписи
Идентификатор ключа GPG: 4AEE18F83AFDEB23
2 изменённых файлов: 4 добавлений и 40 удалений

6
.github/dependabot.yml поставляемый
Просмотреть файл

@ -4,14 +4,14 @@ updates:
directory: "/app"
schedule:
interval: weekly
target-branch: dependencies
target-branch: main
- package-ecosystem: pip
directory: "/app"
schedule:
interval: weekly
target-branch: dependencies
target-branch: main
- package-ecosystem: pip
directory: "/app/tests"
schedule:
interval: weekly
target-branch: dependencies
target-branch: main

Просмотреть файл

@ -71,47 +71,11 @@ each dependency. To merge those into main, use the following process:
### Merge Dependabot PRs
1. Dependabot will create many individual PRs against the `dependencies` branch, which has no
1. Dependabot will create many individual PRs against the `main` branch, which has no
branch protections and so each of those PRs can be merged automatically by adding the following comment to
each PR:
@dependabot squash and merge
1. The dependencies branch can now be merged into `main` by [creating a PR using the GitHub web interface](https://github.com/mozilla/experimenter/compare/main...dependencies)
1. Tag a reviewer for the Dependencies PR and when it is approved, merge it.
### Clean up dependencies branch
1. Check out the `main` branch on your local repo:
```
git checkout main
```
1. Make sure it's up to date with the Mozilla remote
```
git pull <mozilla> main
```
1. Delete your local dependencies branch
```
git branch -D dependencies
```
1. Recreate the dependencies branch from your up to date main
```
git checkout -B dependencies
```
1. Force push that on to the Mozilla repo
```
git push <mozilla> dependencies -f
```
All done!