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 <stephen@that.guru>
(cherry picked from commit b39dabffa4c55f45419b13b240bd924fea84b969)
(cherry picked from commit b89ba00e375fdeb86dd3b92fcf40aec6fd7e9e40)

diff --git a/releasenotes/config.yaml b/releasenotes/config.yaml
index fd99ee37a982987fa2a0e574eb01c9a58394fdc8..ddae386fc530d33b245e3bcbc49f3cb10aa748d1 100644 (file)
--- 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<pre_release>-rc(?:\d)*)$'
 sections:

diff --git a/tools/post-receive.hook b/tools/post-receive.hook
index 9f2f0503d7eeb5db2d1d095ea263e5b0755eebfd..67f234b02c7f7295fb14d07062570621c5ed6b68 100755 (executable)
--- 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.,