From b5aaa9017827d5ab701831d363e03e89a8970cd3 Mon Sep 17 00:00:00 2001 From: David Allsopp Date: Tue, 28 Sep 2021 16:23:38 +0100 Subject: [PATCH 1/2] opam-repository-mingw has 4.13.0 --- src-opam/dockerfile_distro.ml | 1 - 1 file changed, 1 deletion(-) diff --git a/src-opam/dockerfile_distro.ml b/src-opam/dockerfile_distro.ml index 2c4a85f4..24e6b2de 100644 --- a/src-opam/dockerfile_distro.ml +++ b/src-opam/dockerfile_distro.ml @@ -250,7 +250,6 @@ let distro_arches ov (d:t) = | `Fedora (`V33|`V34), ov when OV.(compare Releases.v4_08_0 ov) = -1 -> [ `X86_64; `Aarch64 ] (* 2021-04-19: should be 4.03 but there's a linking failure until 4.06. *) | `Windows (`Msvc, _), ov when OV.(compare Releases.v4_06_0 ov) = 1 -> [] - | `Windows (_, _), ov when OV.(compare ov Releases.v4_13_0) >= 0 -> [] | _ -> [ `X86_64 ] From 98de33d8633bad008d960cb4d2554cbcb33495a6 Mon Sep 17 00:00:00 2001 From: David Allsopp Date: Tue, 28 Sep 2021 16:26:36 +0100 Subject: [PATCH 2/2] Update Changes --- CHANGES.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGES.md b/CHANGES.md index e53846d8..8414bf4f 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -1,6 +1,8 @@ unreleased ---------- +- Asssume Windows x64 is an active distro even when it doesn't have the latest + release (@dra27 #66; #68) - Ensure stray double-quotes don't end up in PATH on Windows images (@dra27 #62) - Stop pinning binutils to 2.35 in Windows builds as that no longer works with GCC 11. (@dra27 #61)