@@ -136,20 +136,25 @@ def get_current_release_version_of_group(group: Group, follows_semver: bool = Fa
136
136
"""
137
137
current_release_version = None
138
138
if follows_semver :
139
- try :
140
- # This sets current_release_version to the latest semver version associated with a group
141
- associated_release_id = GroupRelease .objects .filter (
142
- project_id = group .project .id , group_id = group .id
143
- ).values_list ("release_id" )
144
-
145
- current_release_version = (
146
- get_semver_releases (group .project )
147
- .filter (id__in = associated_release_id )
148
- .values_list ("version" , flat = True )[:1 ]
149
- .get ()
150
- )
151
- except Release .DoesNotExist :
152
- pass
139
+ if not features .has (
140
+ "organizations:releases-resolve-next-release-semver-fix" , group .project .organization
141
+ ):
142
+ try :
143
+ # This sets current_release_version to the latest semver version associated with a group
144
+ associated_release_id = GroupRelease .objects .filter (
145
+ project_id = group .project .id , group_id = group .id
146
+ ).values_list ("release_id" )
147
+ current_release_version = (
148
+ get_semver_releases (group .project )
149
+ .filter (id__in = associated_release_id )
150
+ .values_list ("version" , flat = True )[:1 ]
151
+ .get ()
152
+ )
153
+ except Release .DoesNotExist :
154
+ pass
155
+ else :
156
+ current_release_version = greatest_semver_release (group .project ).version
157
+
153
158
else :
154
159
# This sets current_release_version to the most recent release associated with a group
155
160
# In order to be able to do that, `use_cache` has to be set to False. Otherwise,
@@ -404,18 +409,9 @@ def update_groups(
404
409
release_version = release .version ,
405
410
)
406
411
407
- if (
408
- features .has (
409
- "organizations:releases-resolve-next-release-semver-fix" ,
410
- project .organization ,
411
- )
412
- and follows_semver
413
- ):
414
- current_release_version = get_release_to_resolve_by (projects [0 ]).version
415
- else :
416
- current_release_version = get_current_release_version_of_group (
417
- group = group , follows_semver = follows_semver
418
- )
412
+ current_release_version = get_current_release_version_of_group (
413
+ group , follows_semver
414
+ )
419
415
420
416
if current_release_version :
421
417
resolution_params .update (
0 commit comments