Remove experimental tag from macOS and FreeBSD (#949)

mtelvers · web-flow · commit c6d394e96f06 · 2024-06-17T13:50:21.000-04:00
* Remove experimental tag from macOS and FreeBSD
diff --git a/lib/build_info.ml b/lib/build_info.ml
@@ -12,17 +12,9 @@ let of_label label = { label; variant = None }
     If it is experimental we allow those builds to fail without failing the
     overall build for a commit. *)
 let experimental_variant s =
-  if
-    Astring.String.(
-      is_prefix ~affix:Variant.lower_bound_label s.label
-      || is_prefix ~affix:Variant.opam_label s.label)
-  then true
-  else
-    match s.variant with
-    | None -> false
-    | Some v ->
-        Astring.String.equal "freebsd" (Variant.distro v)
-        || Astring.String.equal "macos-homebrew" (Variant.distro v)
+  Astring.String.(
+    is_prefix ~affix:Variant.lower_bound_label s.label
+    || is_prefix ~affix:Variant.opam_label s.label)
 
 (** Like [experimental_variant], but takes strings for when a [build_info]
     record is unavailable.
@@ -32,6 +24,4 @@ let experimental_variant s =
 let experimental_variant_str s =
   Astring.String.(
     is_prefix ~affix:Variant.lower_bound_label s
-    || is_prefix ~affix:Variant.opam_label s
-    || is_prefix ~affix:"freebsd" s
-    || is_prefix ~affix:"macos-homebrew" s)
+    || is_prefix ~affix:Variant.opam_label s)
diff --git a/test/service/test_pipeline.ml b/test/service/test_pipeline.ml
@@ -92,17 +92,6 @@ let test_experimental () =
         [
           (true, of_label Variant.lower_bound_label);
           (false, of_label Variant.doc_label);
-          ( true,
-            {
-              label = "";
-              variant =
-                Some (variant "macos-homebrew" Ocaml_version.Releases.v5_0);
-            } );
-          ( true,
-            {
-              label = "";
-              variant = Some (variant "freebsd" Ocaml_version.Releases.v5_1);
-            } );
           ( false,
             {
               label = "";
