Skip to content

Commit 9bd984c

Browse files
authored
Merge pull request #106 from oceanbase/hotfix/develop-target-updates
chore: retarget dependabot updates to develop
2 parents dd20305 + a69ba71 commit 9bd984c

3 files changed

Lines changed: 6 additions & 2 deletions

File tree

.github/dependabot.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ updates:
66
# Python dependencies (weekly)
77
- package-ecosystem: "pip"
88
directory: "/"
9+
target-branch: "develop"
910
schedule:
1011
interval: "weekly"
1112
day: "monday"
@@ -37,6 +38,7 @@ updates:
3738
# GitHub Actions (monthly)
3839
- package-ecosystem: "github-actions"
3940
directory: "/"
41+
target-branch: "develop"
4042
schedule:
4143
interval: "monthly"
4244
open-pull-requests-limit: 5

CONTRIBUTING.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,8 @@ git push origin feature/onboard-docker-compose
109109
- `feature/*`, `bugfix/*`, `chore/*`, `docs/*`, `refactor/*`, `test/*` -> `develop`
110110
- `release/*` -> `main`
111111
- `hotfix/*` -> `main`, then back-merge to `develop`
112-
- Dependabot PRs may continue to target `main` until `develop` is fully reconciled with the current `main` history
112+
- Dependabot version updates target `develop`
113+
- Dependabot security updates still follow the GitHub default branch until a repo admin switches the default branch from `main` to `develop`
113114

114115
Include:
115116
- Problem you're solving

README.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -419,6 +419,7 @@ make lint # ruff check + mypy
419419
See `CONTRIBUTING.md` for detailed developer setup and the PR process. When submitting a PR, please:
420420
- Target `develop` for regular work (`feature/*`, `bugfix/*`, `chore/*`, `docs/*`, `refactor/*`, `test/*`)
421421
- Use `release/*` or `hotfix/*` as the normal PR sources into `main`
422-
- Expect Dependabot maintenance PRs to continue targeting `main` until `develop` is fully reconciled
422+
- Dependabot version updates now target `develop`
423+
- Dependabot security updates still follow the GitHub default branch until a repo admin switches the default branch from `main` to `develop`
423424
- Reference the issue (e.g., `Closes #43`) in the PR body
424425
- Run linters and tests locally

0 commit comments

Comments
 (0)