@@ -141,7 +141,10 @@ def _merge_bot_merge_pr(org, repo, merge_bot_branch, cwd, dry_run=False):
141
141
d for d in modified_addon_dirs if is_addon_dir (d , installable_only = True )
142
142
]
143
143
144
- # update HISTORY.rst using towncrier, before generating README.rst
144
+ # Update HISTORY.rst using towncrier, before generating README.rst.
145
+ # We don't do this if nobump is specified, because updating the changelog
146
+ # is something we only do when "releasing", and patch|minor|major is
147
+ # the way to mean "release" in OCA.
145
148
if bumpversion_mode != "nobump" :
146
149
_merge_bot_towncrier (
147
150
org ,
@@ -165,7 +168,7 @@ def _merge_bot_merge_pr(org, repo, merge_bot_branch, cwd, dry_run=False):
165
168
# so setuptools-odoo generates a round version number
166
169
# (without .dev suffix).
167
170
bump_manifest_version (addon_dir , bumpversion_mode , git_commit = True )
168
- build_and_check_wheel (addon_dir )
171
+ build_and_check_wheel (addon_dir )
169
172
if dry_run :
170
173
_logger .info (f"DRY-RUN git push in { org } /{ repo } @{ target_branch } " )
171
174
else :
@@ -174,11 +177,7 @@ def _merge_bot_merge_pr(org, repo, merge_bot_branch, cwd, dry_run=False):
174
177
["git" , "push" , "origin" , f"{ merge_bot_branch } :{ target_branch } " ], cwd = cwd
175
178
)
176
179
# build and publish wheel
177
- if (
178
- bumpversion_mode != "nobump"
179
- and modified_installable_addon_dirs
180
- and SIMPLE_INDEX_ROOT
181
- ):
180
+ if modified_installable_addon_dirs and SIMPLE_INDEX_ROOT :
182
181
for addon_dir in modified_installable_addon_dirs :
183
182
build_and_publish_wheel (addon_dir , SIMPLE_INDEX_ROOT , dry_run )
184
183
# TODO wlc unlock modified_addons
0 commit comments