From fe7ca90cd6da8ce1a08a619fe0884378bdde9444 Mon Sep 17 00:00:00 2001 From: Adam Warner Date: Mon, 2 Sep 2024 22:21:20 +0100 Subject: [PATCH] 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 6fff93e7..5f702bf7 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 48e1c663..0ebafb7e 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 4a308af5..de32ff71 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.