Skip to content

Commit 7f3b33e

Browse files
authored
latest_submodules.py uses AWS-LC-FIPS releases in aws-crt-java (#1125)
1 parent a8f6315 commit 7f3b33e

File tree

1 file changed

+8
-3
lines changed

1 file changed

+8
-3
lines changed

scripts/latest_submodules.py

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ def get_submodules():
5353
return sorted(submodules, key=lambda x: x['name'])
5454

5555

56-
def get_release_tags():
56+
def get_release_tags(prefix='v'):
5757
"""
5858
Return list of release tags for current repo, sorted high to low.
5959
@@ -69,7 +69,7 @@ def get_release_tags():
6969
for line in git_output.splitlines():
7070
# line looks like: "e18f041a0c8d17189f2eae2a32f16e0a7a3f0f1c refs/tags/v0.5.18"
7171
match = re.match(
72-
r'([a-f0-9]+)\s+refs/tags/(v([0-9]+)\.([0-9]+)\.([0-9]+))$', line)
72+
r'([a-f0-9]+)\s+refs/tags/(' + prefix + r'([0-9]+)\.([0-9]+)\.([0-9]+))$', line)
7373
if not match:
7474
# skip malformed release tags
7575
continue
@@ -118,7 +118,12 @@ def main():
118118

119119
os.chdir(os.path.join(root_path, submodule['path']))
120120

121-
tags = get_release_tags()
121+
version_prefix = 'v'
122+
# aws-crt-java uses FIPS releases of aws-lc
123+
if name == 'aws-lc' and 'aws-crt-java' in root_path:
124+
version_prefix = 'AWS-LC-FIPS-'
125+
126+
tags = get_release_tags(version_prefix)
122127
current_commit = get_current_commit()
123128
current_tag = get_tag_for_commit(tags, current_commit)
124129
sync_from = current_tag['version'] if current_tag else current_commit

0 commit comments

Comments
 (0)