Skip to content

Commit 8fbcac7

Browse files
committed
Bug 1993054 - Add iOS versions to mobile product details
This is basically the same thing as what we're doing for android.
1 parent 3e05bb7 commit 8fbcac7

3 files changed

Lines changed: 27 additions & 6 deletions

File tree

api/src/shipit_api/admin/product_details.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626
import sqlalchemy
2727
import sqlalchemy.orm
2828
from mozilla_version.gecko import FirefoxVersion
29+
from mozilla_version.ios import MobileIosVersion
2930
from mozilla_version.mobile import MobileVersion
3031

3132
import cli_common.command
@@ -997,8 +998,8 @@ def get_mobile_versions(releases: typing.List[shipit_api.common.models.Release],
997998
}
998999
"""
9991000
return dict(
1000-
ios_beta_version=shipit_api.common.config.IOS_BETA_VERSION,
1001-
ios_version=shipit_api.common.config.IOS_VERSION,
1001+
ios_beta_version=get_latest_version(releases, Product.FIREFOX_IOS, filter_closure=lambda r: MobileIosVersion.parse(r.version).is_beta),
1002+
ios_version=get_latest_version(releases, Product.FIREFOX_IOS, filter_closure=lambda r: not MobileIosVersion.parse(r.version).is_beta),
10021003
nightly_version=firefox_nightly_version,
10031004
alpha_version=firefox_nightly_version,
10041005
beta_version=get_latest_version(releases, Product.FIREFOX_ANDROID, filter_closure=lambda r: MobileVersion.parse(r.version).is_beta),

api/src/shipit_api/common/config.py

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -49,10 +49,6 @@
4949
# still rely on this value.
5050
FIREFOX_AURORA = ""
5151

52-
# IOS versions
53-
IOS_BETA_VERSION = ""
54-
IOS_VERSION = ""
55-
5652
# Thunderbird configs
5753
LATEST_THUNDERBIRD_ALPHA_VERSION = "54.0a2"
5854

api/tests/test_product_details.py

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -138,6 +138,25 @@ async def test_rebuild(app, tmp_path):
138138
status="shipped",
139139
partial_updates=None,
140140
)
141+
for branch, version in (
142+
("beta", "133.0b7"),
143+
("beta", "134.0b1"),
144+
("beta", "134.0b2"),
145+
("release/v135", "135.0"),
146+
("release/v136", "136.0"),
147+
("release/v136", "136.1"),
148+
):
149+
ios_release = Release(
150+
product="firefox-ios",
151+
branch=branch,
152+
version=version,
153+
revision="9fb87e89c26069198ce2a59a0a790a264d225169",
154+
build_number=1,
155+
release_eta=None,
156+
status="shipped",
157+
partial_updates=None,
158+
)
159+
app.app.db.session.add(ios_release)
141160
app.app.db.session.add(fxnightly)
142161
app.app.db.session.add(tbnightly)
143162
app.app.db.session.add(deved)
@@ -220,3 +239,8 @@ async def test_rebuild(app, tmp_path):
220239

221240
assert not list(parent.glob("l10n/Devedition-*"))
222241
assert next(parent.glob("l10n/Firefox-134.0b8-*")).name == "Firefox-134.0b8-build1.json"
242+
243+
with (parent / "mobile_versions.json").open() as f:
244+
mobile_versions = json.load(f)
245+
assert mobile_versions["ios_beta_version"] == "134.0b2"
246+
assert mobile_versions["ios_version"] == "136.1"

0 commit comments

Comments
 (0)