From 291010b135d06fe3ee36004b95f2bb73512af618 Mon Sep 17 00:00:00 2001 From: Adam Warner Date: Mon, 2 Sep 2024 22:11:31 +0100 Subject: [PATCH 1/3] chore: Update target-branch in dependabot.yml to development Signed-off-by: Adam Warner --- .github/dependabot.yml | 39 +++------------------------------------ 1 file changed, 3 insertions(+), 36 deletions(-) diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 91eb58745..7202fb3e0 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -7,7 +7,7 @@ updates: day: saturday time: "10:00" open-pull-requests-limit: 10 - target-branch: devel + target-branch: development versioning-strategy: increase reviewers: - "pi-hole/web-maintainers" @@ -18,7 +18,7 @@ updates: day: saturday time: "10:00" open-pull-requests-limit: 10 - target-branch: devel + target-branch: development reviewers: - "pi-hole/web-maintainers" - package-ecosystem: composer @@ -28,39 +28,6 @@ updates: day: saturday time: "10:00" open-pull-requests-limit: 10 - target-branch: devel - 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 + target-branch: development reviewers: - "pi-hole/web-maintainers" From 99be2e113fa38ce2e86187a44bef3ef535eb0d2f Mon Sep 17 00:00:00 2001 From: Adam Warner Date: Mon, 2 Sep 2024 22:20:24 +0100 Subject: [PATCH 2/3] Update branch name in sync-back-to-dev workflow Signed-off-by: Adam Warner --- .github/workflows/sync-back-to-dev.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/sync-back-to-dev.yml b/.github/workflows/sync-back-to-dev.yml index cb53b2f69..b391a1430 100644 --- a/.github/workflows/sync-back-to-dev.yml +++ b/.github/workflows/sync-back-to-dev.yml @@ -13,6 +13,6 @@ jobs: - name: Checkout uses: actions/checkout@v4.1.1 - 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: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} From fe7ca90cd6da8ce1a08a619fe0884378bdde9444 Mon Sep 17 00:00:00 2001 From: Adam Warner Date: Mon, 2 Sep 2024 22:21:20 +0100 Subject: [PATCH 3/3] update branch name in various other places from devel->development Signed-off-by: Adam Warner --- .github/workflows/codeql.yml | 4 ++-- .github/workflows/test.yml | 2 +- CONTRIBUTING.md | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml index 6fff93e72..5f702bf70 100644 --- a/.github/workflows/codeql.yml +++ b/.github/workflows/codeql.yml @@ -4,13 +4,13 @@ on: push: branches: - master - - devel + - development - "!dependabot/**" pull_request: # The branches below must be a subset of the branches above branches: - master - - devel + - development schedule: - cron: "0 0 * * 0" diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 48e1c6633..0ebafb7e8 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -3,7 +3,7 @@ name: Tests on: push: branches: - - devel + - development - master pull_request: branches: diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 4a308af57..de32ff715 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -31,8 +31,8 @@ When requesting or submitting new features, first consider whether it might be u ## Technical Requirements -- Submit Pull Requests to the **devel 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!) +- Submit Pull Requests to the **development branch only**. +- 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. - 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.