Skip to content

Commit 5c8945c

Browse files
authored
chore: Update target-branch in dependabot.yml to development (#3126)
2 parents be05b0f + fe7ca90 commit 5c8945c

File tree

5 files changed

+9
-42
lines changed

5 files changed

+9
-42
lines changed

.github/dependabot.yml

Lines changed: 3 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ updates:
77
day: saturday
88
time: "10:00"
99
open-pull-requests-limit: 10
10-
target-branch: devel
10+
target-branch: development
1111
versioning-strategy: increase
1212
reviewers:
1313
- "pi-hole/web-maintainers"
@@ -18,7 +18,7 @@ updates:
1818
day: saturday
1919
time: "10:00"
2020
open-pull-requests-limit: 10
21-
target-branch: devel
21+
target-branch: development
2222
reviewers:
2323
- "pi-hole/web-maintainers"
2424
- package-ecosystem: composer
@@ -28,39 +28,6 @@ updates:
2828
day: saturday
2929
time: "10:00"
3030
open-pull-requests-limit: 10
31-
target-branch: devel
32-
reviewers:
33-
- "pi-hole/web-maintainers"
34-
35-
# As above, but for development-v6
36-
- package-ecosystem: npm
37-
directory: "/"
38-
schedule:
39-
interval: weekly
40-
day: saturday
41-
time: "10:00"
42-
open-pull-requests-limit: 10
43-
target-branch: development-v6
44-
versioning-strategy: increase
45-
reviewers:
46-
- "pi-hole/web-maintainers"
47-
- package-ecosystem: github-actions
48-
directory: "/"
49-
schedule:
50-
interval: weekly
51-
day: saturday
52-
time: "10:00"
53-
open-pull-requests-limit: 10
54-
target-branch: development-v6
55-
reviewers:
56-
- "pi-hole/web-maintainers"
57-
- package-ecosystem: composer
58-
directory: "/"
59-
schedule:
60-
interval: weekly
61-
day: saturday
62-
time: "10:00"
63-
open-pull-requests-limit: 10
64-
target-branch: development-v6
31+
target-branch: development
6532
reviewers:
6633
- "pi-hole/web-maintainers"

.github/workflows/codeql.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,13 @@ on:
44
push:
55
branches:
66
- master
7-
- devel
7+
- development
88
- "!dependabot/**"
99
pull_request:
1010
# The branches below must be a subset of the branches above
1111
branches:
1212
- master
13-
- devel
13+
- development
1414
schedule:
1515
- cron: "0 0 * * 0"
1616

.github/workflows/sync-back-to-dev.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,6 @@ jobs:
1313
- name: Checkout
1414
uses: actions/checkout@v4.1.1
1515
- name: Opening pull request
16-
run: gh pr create -B devel -H master --title 'Sync master back into development' --body 'Created by Github action' --label 'internal'
16+
run: gh pr create -B development -H master --title 'Sync master back into development' --body 'Created by Github action' --label 'internal'
1717
env:
1818
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ name: Tests
33
on:
44
push:
55
branches:
6-
- devel
6+
- development
77
- master
88
pull_request:
99
branches:

CONTRIBUTING.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,8 @@ When requesting or submitting new features, first consider whether it might be u
3131

3232
## Technical Requirements
3333

34-
- Submit Pull Requests to the **devel branch only**.
35-
- Before Submitting your Pull Request, merge `devel` with your new branch and fix any conflicts. (Make sure you don't break anything in development!)
34+
- Submit Pull Requests to the **development branch only**.
35+
- Before Submitting your Pull Request, merge `development` with your new branch and fix any conflicts. (Make sure you don't break anything in development!)
3636
- Commit Unix line endings.
3737
- Please use the Pi-hole brand: **Pi-hole** (Take a special look at the capitalized 'P' and a low 'h' with a hyphen)
3838
- (Optional fun) keep to the theme of Star Trek/black holes/gravity.

0 commit comments

Comments
 (0)