Skip to content

Commit

Permalink
Update macOS builds
Browse files Browse the repository at this point in the history
  • Loading branch information
np5 committed Feb 11, 2025
1 parent c0afeac commit cb1aec5
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 4 deletions.
5 changes: 5 additions & 0 deletions tests/inventory/test_macos_build_parser.py
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,8 @@ def test_ok(self):
("22G830", ("macOS", 13, 6, 9, None), "macOS 13.6.9 (22G830)"),
("22H123", ("macOS", 13, 7, 0, None), "macOS 13.7 (22H123)"),
("22H221", ("macOS", 13, 7, 1, None), "macOS 13.7.1 (22H221)"),
("22H313", ("macOS", 13, 7, 2, None), "macOS 13.7.2 (22H313)"),
("22H417", ("macOS", 13, 7, 3, None), "macOS 13.7.3 (22H417)"),
("23A344", ("macOS", 14, 0, 0, None), "macOS 14.0 (23A344)"),
("23B5056e", ("macOS", 14, 1, 0, None), "macOS 14.1 (23B5056e)"),
("23B81", ("macOS", 14, 1, 1, None), "macOS 14.1.1 (23B81)"),
Expand All @@ -109,9 +111,12 @@ def test_ok(self):
("23G93", ("macOS", 14, 6, 1, None), "macOS 14.6.1 (23G93)"),
("23H124", ("macOS", 14, 7, 0, None), "macOS 14.7 (23H124)"),
("23H222", ("macOS", 14, 7, 1, None), "macOS 14.7.1 (23H222)"),
("23H311", ("macOS", 14, 7, 2, None), "macOS 14.7.2 (23H311)"),
("23H417", ("macOS", 14, 7, 3, None), "macOS 14.7.3 (23H417)"),
("24A335", ("macOS", 15, 0, 0, None), "macOS 15.0 (24A335)"),
("24A348", ("macOS", 15, 0, 1, None), "macOS 15.0.1 (24A348)"),
("24B91", ("macOS", 15, 1, 1, None), "macOS 15.1.1 (24B91)"),
("24D70", ("macOS", 15, 3, 1, None), "macOS 15.3.1 (24D70)"),
):
expected_version_d = {
"name": name,
Expand Down
10 changes: 6 additions & 4 deletions zentral/contrib/inventory/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -248,13 +248,15 @@ def macos_version_from_build(build):
"22A400", "22D68", "22E261", "22E772610a", "22F82", "22F770820b", "22F770820d",
"22G90", "22G313", "22H221",
"23B81", "23B2082", "23C71", "23D60", "23G93", "23H222",
"24A348", "24B91"):
"24A348", "24B91", "24D70"):
patch = 1
elif build in ("21G309", "21G320", "21G1974",
"22G91", "22G320",
"23B2091", "23B92"):
"22G91", "22G320", "22H313",
"23B2091", "23B92", "23H311"):
patch = 2
elif build in ("21G417", "21G419", "21H1015", "22G436"):
elif build in ("21G417", "21G419", "21H1015",
"22G436", "22H417",
"23H417"):
patch = 3
elif build in ("21G526", "21H1123", "22G513"):
patch = 4
Expand Down

0 comments on commit cb1aec5

Please sign in to comment.