Skip to content

Commit dc2bbee

Browse files
authored
Merge pull request #354 from digital-clouds/next
Migrate to Dependabot and establish branching strategy
2 parents 5ac706f + 2d5dbb6 commit dc2bbee

3 files changed

Lines changed: 24 additions & 8 deletions

File tree

.github/dependabot.yml

Lines changed: 16 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,31 @@
11
version: 2
22
updates:
3+
# Maintain dependencies for pnpm
34
- package-ecosystem: "npm"
45
directory: "/"
56
schedule:
67
interval: "daily"
8+
time: "04:00"
9+
timezone: "UTC"
10+
open-pull-requests-limit: 10
711
labels:
812
- "dependencies"
9-
- "npm"
13+
- "javascript"
1014
commit-message:
11-
prefix: "chore(deps)"
12-
open-pull-requests-limit: 5
15+
prefix: "chore(deps):"
16+
ignore:
17+
- dependency-name: "vite"
18+
update-types: ["version-update:semver-major"]
19+
20+
# Maintain dependencies for GitHub Actions
1321
- package-ecosystem: "github-actions"
14-
directory: ".github/workflows"
22+
directory: "/"
1523
schedule:
16-
interval: "daily"
24+
interval: "weekly"
25+
day: "monday"
26+
open-pull-requests-limit: 5
1727
labels:
1828
- "dependencies"
1929
- "github-actions"
2030
commit-message:
21-
prefix: "chore(ci)"
22-
open-pull-requests-limit: 5
31+
prefix: "chore(actions):"

.github/workflows/cloudflare-pages.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
name: "🛳 Deploy"
33
on:
44
push:
5-
branches: [main]
5+
branches: [main, next]
66
workflow_dispatch: {}
77

88
permissions:

docs/README.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,13 @@
2222
#3) With great power comes great responsibility.
2323
```
2424

25+
## Branching Strategy
26+
27+
- **`main`**: Production branch. Contains stable, released code.
28+
- _Rules_: No direct commits. Pull requests only from `next`.
29+
- **`next`**: Development branch. Integration for new features and bug fixes.
30+
- _Rules_: No direct commits for major features. Pull requests from `feature-*` or `bug-*` branches.
31+
2532
## Development
2633

2734
- [Propose](https://github.com/digital-clouds/osint/issues/new) the resources

0 commit comments

Comments
 (0)