Skip to content

Commit fc7bd07

Browse files
mtelversmtelvers
authored
Merge pull request #251 from ocurrent/cygwin-ltsc-2025
Update Cygwin base image to ServerCore LTSC 2025
2 parents 2bf4063 + 2c8f057 commit fc7bd07

File tree

3 files changed

+18
-7
lines changed

3 files changed

+18
-7
lines changed

‎CHANGES.md‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
unreleased
2+
----------
3+
4+
- Update Cygwin base image to ServerCore LTSC 2025 (@MisterDA, #251)
5+
16
v8.3.4 2025-12-03
27
-----------------
38

‎src-opam/distro.ml‎

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ type distro =
108108
| `V24_10
109109
| `V25_04
110110
| `V25_10 ]
111-
| `Cygwin of [ `Ltsc2016 | `Ltsc2019 | `Ltsc2022 ]
111+
| `Cygwin of [ `Ltsc2016 | `Ltsc2019 | `Ltsc2022 | `Ltsc2025 ]
112112
| `Windows of [ `Mingw | `Msvc ] * [ `Ltsc2019 ]
113113
| `WindowsServer of [ `Mingw | `Msvc ] * [ `Ltsc2022 | `Ltsc2025 ] ]
114114
[@@deriving sexp]
@@ -216,7 +216,7 @@ type t =
216216
| `V25_10
217217
| `Latest
218218
| `LTS ]
219-
| `Cygwin of [ `Ltsc2016 | `Ltsc2019 | `Ltsc2022 | `Latest ]
219+
| `Cygwin of [ `Ltsc2016 | `Ltsc2019 | `Ltsc2022 | `Ltsc2025 | `Latest ]
220220
| `Windows of [ `Mingw | `Msvc ] * [ `Ltsc2019 | `Latest ]
221221
| `WindowsServer of [ `Mingw | `Msvc ] * [ `Ltsc2022 | `Ltsc2025 | `Latest ]
222222
]
@@ -366,6 +366,7 @@ let distros : t list =
366366
`Cygwin `Ltsc2016;
367367
`Cygwin `Ltsc2019;
368368
`Cygwin `Ltsc2022;
369+
`Cygwin `Ltsc2025;
369370
`Cygwin `Latest;
370371
`Windows (`Mingw, `Ltsc2019);
371372
`Windows (`Mingw, `Latest);
@@ -389,7 +390,7 @@ let resolve_alias (d : t) : distro =
389390
| `OpenSUSE `Latest -> `OpenSUSE `V16_0
390391
| `Ubuntu `Latest -> `Ubuntu `V25_10
391392
| `Ubuntu `LTS -> `Ubuntu `V24_04
392-
| `Cygwin `Latest -> `Cygwin `Ltsc2022
393+
| `Cygwin `Latest -> `Cygwin `Ltsc2025
393394
| `Windows (cc, `Latest) -> `Windows (cc, `Ltsc2019)
394395
| `WindowsServer (cc, `Latest) -> `WindowsServer (cc, `Ltsc2025)
395396
| ( `Alpine
@@ -413,7 +414,7 @@ let resolve_alias (d : t) : distro =
413414
| `V17_10 | `V18_04 | `V18_10 | `V19_04 | `V19_10 | `V20_04 | `V20_10
414415
| `V21_04 | `V21_10 | `V22_04 | `V22_10 | `V23_04 | `V23_10 | `V24_04
415416
| `V24_10 | `V25_04 | `V25_10 )
416-
| `Cygwin (`Ltsc2016 | `Ltsc2019 | `Ltsc2022)
417+
| `Cygwin (`Ltsc2016 | `Ltsc2019 | `Ltsc2022 | `Ltsc2025)
417418
| `Windows (_, `Ltsc2019)
418419
| `WindowsServer (_, (`Ltsc2022 | `Ltsc2025)) ) as d ->
419420
d
@@ -458,7 +459,7 @@ let distro_status (d : t) : status =
458459
| `V21_04 | `V21_10 | `V22_10 | `V23_04 | `V23_10 | `V24_10 ) ->
459460
`Deprecated
460461
| `Cygwin (`Ltsc2016 | `Ltsc2019) -> `Deprecated
461-
| `Cygwin `Ltsc2022 -> `Active `Tier3
462+
| `Cygwin (`Ltsc2022 | `Ltsc2025) -> `Active `Tier3
462463
| `Windows (_, `Ltsc2019) -> `Active `Tier3
463464
| `WindowsServer (_, (`Ltsc2022 | `Ltsc2025)) -> `Active `Tier3
464465

@@ -796,6 +797,7 @@ let tag_of_distro (d : t) =
796797
| `Cygwin `Ltsc2016 -> "cygwin-2016"
797798
| `Cygwin `Ltsc2019 -> "cygwin-2019"
798799
| `Cygwin `Ltsc2022 -> "cygwin-2022"
800+
| `Cygwin `Ltsc2025 -> "cygwin-2025"
799801
| `Cygwin `Latest -> "cygwin"
800802
| `Windows (`Mingw, `Ltsc2019) -> "windows-mingw-ltsc2019"
801803
| `Windows (`Mingw, `Latest) -> "windows-mingw"
@@ -918,6 +920,7 @@ let distro_of_tag x : t option =
918920
| "cygwin-ltsc2016" -> Some (`Cygwin `Ltsc2016)
919921
| "cygwin-ltsc2019" -> Some (`Cygwin `Ltsc2019)
920922
| "cygwin-ltsc2022" -> Some (`Cygwin `Ltsc2022)
923+
| "cygwin-ltsc2025" -> Some (`Cygwin `Ltsc2025)
921924
| "cygwin" -> Some (`Cygwin `Latest)
922925
| "windows-mingw-ltsc2019" -> Some (`Windows (`Mingw, `Ltsc2019))
923926
| "windows-mingw" -> Some (`Windows (`Mingw, `Latest))
@@ -1036,6 +1039,7 @@ let human_readable_string_of_distro (d : t) =
10361039
| `Cygwin `Ltsc2016 -> "Cygwin Ltsc2016"
10371040
| `Cygwin `Ltsc2019 -> "Cygwin Ltsc2019"
10381041
| `Cygwin `Ltsc2022 -> "Cygwin Ltsc2022"
1042+
| `Cygwin `Ltsc2025 -> "Cygwin Ltsc2025"
10391043
| `Windows (`Mingw, `Ltsc2019) -> "Windows Ltsc2019 mingw"
10401044
| `Windows (`Msvc, `Ltsc2019) -> "Windows Ltsc2019 msvc"
10411045
| `WindowsServer (`Mingw, `Ltsc2022) -> "Windows Server Ltsc2022 mingw"
@@ -1346,6 +1350,7 @@ let base_distro_tag ?(arch = `X86_64) d =
13461350
| `Ltsc2016 -> "ltsc2016"
13471351
| `Ltsc2019 -> "ltsc2019"
13481352
| `Ltsc2022 -> "ltsc2022"
1353+
| `Ltsc2025 -> "ltsc2025"
13491354
in
13501355
("mcr.microsoft.com/windows/servercore", tag)
13511356
| `Windows v ->
@@ -1394,6 +1399,7 @@ let sort_key_of_distro (d : t) =
13941399
| `Cygwin `Ltsc2016 -> 40000
13951400
| `Cygwin `Ltsc2019 -> 40001
13961401
| `Cygwin `Ltsc2022 -> 40002
1402+
| `Cygwin `Ltsc2025 -> 40003
13971403
| `Debian `V7 -> 50000
13981404
| `Debian `V8 -> 50001
13991405
| `Debian `V9 -> 50002

‎src-opam/distro.mli‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ type distro =
110110
| `V24_10
111111
| `V25_04
112112
| `V25_10 ]
113-
| `Cygwin of [ `Ltsc2016 | `Ltsc2019 | `Ltsc2022 ]
113+
| `Cygwin of [ `Ltsc2016 | `Ltsc2019 | `Ltsc2022 | `Ltsc2025 ]
114114
| `Windows of [ `Mingw | `Msvc ] * [ `Ltsc2019 ]
115115
| `WindowsServer of [ `Mingw | `Msvc ] * [ `Ltsc2022 | `Ltsc2025 ] ]
116116
[@@deriving sexp]
@@ -218,7 +218,7 @@ type t =
218218
| `V25_10
219219
| `Latest
220220
| `LTS ]
221-
| `Cygwin of [ `Ltsc2016 | `Ltsc2019 | `Ltsc2022 | `Latest ]
221+
| `Cygwin of [ `Ltsc2016 | `Ltsc2019 | `Ltsc2022 | `Ltsc2025 | `Latest ]
222222
| `Windows of [ `Mingw | `Msvc ] * [ `Ltsc2019 | `Latest ]
223223
| `WindowsServer of [ `Mingw | `Msvc ] * [ `Ltsc2022 | `Ltsc2025 | `Latest ]
224224
]

0 commit comments

Comments
 (0)