From ee53e3c02d7a258fbca59c0e3852cacef02fd946 Mon Sep 17 00:00:00 2001 From: Tom Krizek Date: Thu, 16 Mar 2023 17:20:41 +0100 Subject: [PATCH 1/2] Update github actions to trigger on correct branches The naming convention for maintanence branches was changed from `vX_Y` to `bind-X.Y`. --- .github/workflows/codeql.yml | 2 +- .github/workflows/sonarcloud.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml index 32feccd140..3c0ca04a45 100644 --- a/.github/workflows/codeql.yml +++ b/.github/workflows/codeql.yml @@ -2,7 +2,7 @@ name: "CodeQL" on: push: - branches: [ "v9_16", "v9_18", "main" ] + branches: [ "bind-9.16", "bind-9.18", "main" ] schedule: - cron: '39 8 * * 3' diff --git a/.github/workflows/sonarcloud.yml b/.github/workflows/sonarcloud.yml index 05246cc674..c405566c0e 100644 --- a/.github/workflows/sonarcloud.yml +++ b/.github/workflows/sonarcloud.yml @@ -2,7 +2,7 @@ name: SonarCloud on: push: - branches: [ "v9_16", "v9_18", "main" ] + branches: [ "bind-9.16", "bind-9.18", "main" ] schedule: - cron: '39 8 * * 3' From 5248a3e7dbbb0040e1f976ff06525eff175ad377 Mon Sep 17 00:00:00 2001 From: Tom Krizek Date: Fri, 24 Mar 2023 14:49:06 +0100 Subject: [PATCH 2/2] Update branch&tag naming convention in CONTRIBUTING --- CONTRIBUTING.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 0b7661b671..4b3db89381 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -71,14 +71,14 @@ To clone the repository, use: > $ git clone https://gitlab.isc.org/isc-projects/bind9.git -Release branch names are of the form `v9_X`, where X represents the second -number in the BIND 9 version number. So, to check out the BIND 9.12 +Release branch names are of the form `bind-9.X`, where X represents the second +number in the BIND 9 version number. So, to check out the BIND 9.18 branch, use: -> $ git checkout v9_12 +> $ git checkout bind-9.18 Whenever a branch is ready for publication, a tag is placed of the -form `v9_X_Y`. The 9.12.0 release, for instance, is tagged as `v9_12_0`. +form `v9.X.Y`. The 9.18.0 release, for instance, is tagged as `v9.18.0`. The branch in which the next major release is being developed is called `main`.