From fae78391033f70ead01241fb59e8e2babcdb55b6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Antonin=20D=C3=A9cimo?= <antonin@tarides.com>
Date: Fri, 15 Jul 2022 16:55:10 +0200
Subject: [PATCH] Run distro on arch if not supported by master distro

Enables running jobs on Ubuntu riscv64 since the master
distro (Debian) doesn't support them.
---
 service/conf.ml | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/service/conf.ml b/service/conf.ml
index 01bf7d1b..4c5aa677 100644
--- a/service/conf.ml
+++ b/service/conf.ml
@@ -116,6 +116,16 @@ let pool_of_arch = function
   | `Ppc64le -> "linux-ppc64"
   | `Riscv64 -> "linux-riscv64"
 
+(* Arches supported by [distro] but unsupported by [DD.master_distro]. *)
+let supplementary_arches ov master_distro distro =
+  if List.mem distro (List.map DD.resolve_alias DD.latest_distros) then
+    let master_distro_arches = DD.distro_arches ov (master_distro :> DD.t)
+    and distro_arches = DD.distro_arches ov (distro :> DD.t) in
+    List.filter
+      (fun arch -> not (List.mem arch master_distro_arches))
+      distro_arches
+  else []
+
 let platforms ~include_macos opam_version =
   let v ?(arch = `X86_64) label distro ocaml_version =
     {
@@ -139,7 +149,11 @@ let platforms ~include_macos opam_version =
       :: List.map
            (fun arch -> v ~arch label tag ov)
            (DD.distro_arches ov (distro :> DD.t))
-    else [ v label tag ov ]
+    else
+      v label tag ov
+      :: List.map
+           (fun arch -> v ~arch label tag ov)
+           (supplementary_arches ov master_distro distro)
   in
   let make_release ?arch ov =
     let distro = DD.tag_of_distro (master_distro :> DD.t) in