From c51425bcfe9a2194e26fb586afb1112e84b3380b Mon Sep 17 00:00:00 2001 From: Stephen Finucane Date: Mon, 18 Jul 2022 12:28:24 +0100 Subject: [PATCH] docs: Actually configure reno to use the main branch I used the wrong setting [1] [1] https://docs.openstack.org/reno/latest/user/usage.html#configuring-reno Signed-off-by: Stephen Finucane (cherry picked from commit b39dabffa4c55f45419b13b240bd924fea84b969) (cherry picked from commit b89ba00e375fdeb86dd3b92fcf40aec6fd7e9e40) --- releasenotes/config.yaml | 2 +- tools/post-receive.hook | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/releasenotes/config.yaml b/releasenotes/config.yaml index fd99ee37..ddae386f 100644 --- a/releasenotes/config.yaml +++ b/releasenotes/config.yaml @@ -1,5 +1,5 @@ --- -branch: main +default_branch: main release_tag_re: 'v\d\.\d\.\d(rc\d+)?' pre_release_tag_re: '(?P-rc(?:\d)*)$' sections: diff --git a/tools/post-receive.hook b/tools/post-receive.hook index 9f2f0503..67f234b0 100755 --- a/tools/post-receive.hook +++ b/tools/post-receive.hook @@ -11,7 +11,7 @@ set -eu PW_DIR=/opt/patchwork/patchwork #TODO: the state map should really live in the repo's git-config -STATE_MAP="refs/heads/master:Accepted" +STATE_MAP="refs/heads/main:Accepted" # ignore all commits already present in these refs # e.g., -- 2.47.3