From 820d63bbfac5e1ce1815a6d32ef82224116bfbb6 Mon Sep 17 00:00:00 2001 From: Adam Warner Date: Mon, 2 Sep 2024 21:28:09 +0100 Subject: [PATCH] Repo dev branch renamed to development --- .github/PULL_REQUEST_TEMPLATE.md | 2 +- .github/dependabot.yml | 37 +++---------------------- .github/workflows/build-and-publish.yml | 11 ++++++-- .github/workflows/sync-back-to-dev.yml | 2 +- CONTRIBUTING.md | 4 +-- README.md | 4 +-- 6 files changed, 19 insertions(+), 41 deletions(-) diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index f21503004..b5eef71c4 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -1,4 +1,4 @@ -`{Please select 'base: dev' as target branch above! (you can delete this line)}` +`{Please select 'base: development' as target branch above! (you can delete this line)}` diff --git a/.github/dependabot.yml b/.github/dependabot.yml index a350cbfde..06ff60f17 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -7,7 +7,7 @@ updates: interval: "weekly" day: saturday time: "10:00" - target-branch: dev + target-branch: development reviewers: - "pi-hole/docker-maintainers" - package-ecosystem: "docker" @@ -16,7 +16,7 @@ updates: interval: "weekly" day: saturday time: "10:00" - target-branch: dev + target-branch: development reviewers: - "pi-hole/docker-maintainers" - package-ecosystem: pip @@ -26,35 +26,6 @@ updates: day: saturday time: "10:00" open-pull-requests-limit: 10 - target-branch: dev + target-branch: development reviewers: - - "pi-hole/docker-maintainers" - # Maintain dependencies for GitHub Actions development-v6 - - package-ecosystem: "github-actions" - directory: "/" - schedule: - interval: "weekly" - day: saturday - time: "10:00" - target-branch: development-v6 - reviewers: - - "pi-hole/docker-maintainers" - - package-ecosystem: "docker" - directory: "/src/" - schedule: - interval: "weekly" - day: saturday - time: "10:00" - target-branch: development-v6 - reviewers: - - "pi-hole/docker-maintainers" - - package-ecosystem: pip - directory: "/test" - schedule: - interval: weekly - day: saturday - time: "10:00" - open-pull-requests-limit: 10 - target-branch: development-v6 - reviewers: - - "pi-hole/docker-maintainers" + - "pi-hole/docker-maintainers" \ No newline at end of file diff --git a/.github/workflows/build-and-publish.yml b/.github/workflows/build-and-publish.yml index 318bf72a6..d8cf2ae79 100644 --- a/.github/workflows/build-and-publish.yml +++ b/.github/workflows/build-and-publish.yml @@ -4,7 +4,7 @@ on: - cron: "0 5 * * *" push: branches: - - dev + - development release: types: [published] @@ -40,7 +40,7 @@ jobs: if: github.event_name == 'schedule' uses: actions/checkout@v4 with: - ref: dev + ref: development - name: Docker meta id: meta @@ -113,7 +113,14 @@ jobs: - build steps: - name: Checkout Repo + if: github.event_name != 'schedule' + uses: actions/checkout@v4 + + - name: Checkout dev branch if scheduled + if: github.event_name == 'schedule' uses: actions/checkout@v4 + with: + ref: development - name: Download digests uses: actions/download-artifact@v4 diff --git a/.github/workflows/sync-back-to-dev.yml b/.github/workflows/sync-back-to-dev.yml index fb0e83148..28dd1b54d 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 - name: Opening pull request - run: gh pr create -B dev -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 }} diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 4bcb67f7b..81bcc83ed 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -2,8 +2,8 @@ Please review the following before opening a pull request (PR) to help your PR go smoothly: -* Code changes go to the `dev` branch first - * To ensure proper testing and quality control, target any code change pull requests against `dev` branch. +* Code changes go to the `development` branch first + * To ensure proper testing and quality control, target any code change pull requests against `development` branch. * Make sure the tests pass * Take a look at [TESTING.md](test/TESTING.md) to see how to run tests locally so you do not have to push all your code to a PR and have GitHub Actions run it. diff --git a/README.md b/README.md index 5167a689a..850050094 100644 --- a/README.md +++ b/README.md @@ -175,9 +175,9 @@ The Date-based (including incremented "Patch" versions) do not relate to any kin | `latest` | Always latest release | | `2022.04.0` | Date-based release | | `2022.04.1` | Second release in a given month | -| `dev` | Similar to `latest`, but for the development branch (pushed occasionally) | +| `development` | Similar to `latest`, but for the development branch (pushed occasionally) | | `*beta` | Early beta releases of upcoming versions - here be dragons | -| `nightly` | Like `dev` but pushed every night and pulls from the latest `development` branches of the core Pi-hole components (Pi-hole, web, FTL) | +| `nightly` | Like `development` but pushed every night and pulls from the latest `development` branches of the core Pi-hole components (Pi-hole, web, FTL) | ## Upgrading, Persistence, and Customizations