mirror of
https://github.com/pi-hole/web.git
synced 2025-12-20 10:48:26 +00:00
Replace references of devel with development in prep for change of branch name
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
This commit is contained in:
39
.github/dependabot.yml
vendored
39
.github/dependabot.yml
vendored
@@ -7,7 +7,7 @@ updates:
|
|||||||
day: saturday
|
day: saturday
|
||||||
time: "10:00"
|
time: "10:00"
|
||||||
open-pull-requests-limit: 10
|
open-pull-requests-limit: 10
|
||||||
target-branch: devel
|
target-branch: development
|
||||||
versioning-strategy: increase
|
versioning-strategy: increase
|
||||||
reviewers:
|
reviewers:
|
||||||
- "pi-hole/web-maintainers"
|
- "pi-hole/web-maintainers"
|
||||||
@@ -18,7 +18,7 @@ updates:
|
|||||||
day: saturday
|
day: saturday
|
||||||
time: "10:00"
|
time: "10:00"
|
||||||
open-pull-requests-limit: 10
|
open-pull-requests-limit: 10
|
||||||
target-branch: devel
|
target-branch: development
|
||||||
reviewers:
|
reviewers:
|
||||||
- "pi-hole/web-maintainers"
|
- "pi-hole/web-maintainers"
|
||||||
- package-ecosystem: composer
|
- package-ecosystem: composer
|
||||||
@@ -28,39 +28,6 @@ updates:
|
|||||||
day: saturday
|
day: saturday
|
||||||
time: "10:00"
|
time: "10:00"
|
||||||
open-pull-requests-limit: 10
|
open-pull-requests-limit: 10
|
||||||
target-branch: development-v6
|
target-branch: development
|
||||||
reviewers:
|
|
||||||
- "pi-hole/web-maintainers"
|
|
||||||
|
|
||||||
# As above, but for development-v6
|
|
||||||
- package-ecosystem: npm
|
|
||||||
directory: "/"
|
|
||||||
schedule:
|
|
||||||
interval: weekly
|
|
||||||
day: saturday
|
|
||||||
time: "10:00"
|
|
||||||
open-pull-requests-limit: 10
|
|
||||||
target-branch: development-v6
|
|
||||||
versioning-strategy: increase
|
|
||||||
reviewers:
|
|
||||||
- "pi-hole/web-maintainers"
|
|
||||||
- package-ecosystem: github-actions
|
|
||||||
directory: "/"
|
|
||||||
schedule:
|
|
||||||
interval: weekly
|
|
||||||
day: saturday
|
|
||||||
time: "10:00"
|
|
||||||
open-pull-requests-limit: 10
|
|
||||||
target-branch: development-v6
|
|
||||||
reviewers:
|
|
||||||
- "pi-hole/web-maintainers"
|
|
||||||
- package-ecosystem: composer
|
|
||||||
directory: "/"
|
|
||||||
schedule:
|
|
||||||
interval: weekly
|
|
||||||
day: saturday
|
|
||||||
time: "10:00"
|
|
||||||
open-pull-requests-limit: 10
|
|
||||||
target-branch: development-v6
|
|
||||||
reviewers:
|
reviewers:
|
||||||
- "pi-hole/web-maintainers"
|
- "pi-hole/web-maintainers"
|
||||||
|
|||||||
4
.github/workflows/codeql.yml
vendored
4
.github/workflows/codeql.yml
vendored
@@ -4,13 +4,13 @@ on:
|
|||||||
push:
|
push:
|
||||||
branches:
|
branches:
|
||||||
- master
|
- master
|
||||||
- devel
|
- development
|
||||||
- "!dependabot/**"
|
- "!dependabot/**"
|
||||||
pull_request:
|
pull_request:
|
||||||
# The branches below must be a subset of the branches above
|
# The branches below must be a subset of the branches above
|
||||||
branches:
|
branches:
|
||||||
- master
|
- master
|
||||||
- devel
|
- development
|
||||||
schedule:
|
schedule:
|
||||||
- cron: "0 0 * * 0"
|
- cron: "0 0 * * 0"
|
||||||
|
|
||||||
|
|||||||
2
.github/workflows/sync-back-to-dev.yml
vendored
2
.github/workflows/sync-back-to-dev.yml
vendored
@@ -13,6 +13,6 @@ jobs:
|
|||||||
- name: Checkout
|
- name: Checkout
|
||||||
uses: actions/checkout@v4.1.7
|
uses: actions/checkout@v4.1.7
|
||||||
- name: Opening pull request
|
- name: Opening pull request
|
||||||
run: gh pr create -B devel -H master --title 'Sync master back into development' --body 'Created by Github action' --label 'internal'
|
run: gh pr create -B development -H master --title 'Sync master back into development' --body 'Created by Github action' --label 'internal'
|
||||||
env:
|
env:
|
||||||
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
||||||
|
|||||||
2
.github/workflows/test.yml
vendored
2
.github/workflows/test.yml
vendored
@@ -3,7 +3,7 @@ name: Tests
|
|||||||
on:
|
on:
|
||||||
push:
|
push:
|
||||||
branches:
|
branches:
|
||||||
- devel
|
- development
|
||||||
- master
|
- master
|
||||||
pull_request:
|
pull_request:
|
||||||
branches:
|
branches:
|
||||||
|
|||||||
@@ -31,8 +31,8 @@ When requesting or submitting new features, first consider whether it might be u
|
|||||||
|
|
||||||
## Technical Requirements
|
## Technical Requirements
|
||||||
|
|
||||||
- Submit Pull Requests to the **devel branch only**.
|
- Submit Pull Requests to the **development branch only**.
|
||||||
- Before Submitting your Pull Request, merge `devel` with your new branch and fix any conflicts. (Make sure you don't break anything in development!)
|
- Before Submitting your Pull Request, merge `development` with your new branch and fix any conflicts. (Make sure you don't break anything in development!)
|
||||||
- Commit Unix line endings.
|
- Commit Unix line endings.
|
||||||
- Please use the Pi-hole brand: **Pi-hole** (Take a special look at the capitalized 'P' and a low 'h' with a hyphen)
|
- Please use the Pi-hole brand: **Pi-hole** (Take a special look at the capitalized 'P' and a low 'h' with a hyphen)
|
||||||
- (Optional fun) keep to the theme of Star Trek/black holes/gravity.
|
- (Optional fun) keep to the theme of Star Trek/black holes/gravity.
|
||||||
|
|||||||
Reference in New Issue
Block a user