ocurrent · tmcgilchrist · Jan 17, 2023 · Jan 9, 2023
diff --git a/obuilder b/obuilder
diff --git a/worker/dune b/worker/dune
@@ -1,3 +1,15 @@
+(rule
+ (deps fetcher.macos.ml)
+ (target fetcher.ml)
+ (enabled_if (= %{system} macosx))
+ (action (copy %{deps} %{target})))
+
+(rule
+ (deps fetcher.docker.ml)
+ (target fetcher.ml)
+ (enabled_if (<> %{system} macosx))
+ (action (copy %{deps} %{target})))
+
 (library
  (name cluster_worker)
  (libraries ocluster-api digestif fpath logs capnp-rpc-lwt lwt.unix prometheus-app cohttp-lwt-unix obuilder extunix))
diff --git a/worker/fetcher.docker.ml b/worker/fetcher.docker.ml
@@ -0,0 +1 @@
+include Obuilder.Docker
diff --git a/worker/fetcher.macos.ml b/worker/fetcher.macos.ml
@@ -0,0 +1 @@
+include Obuilder.User_temp
diff --git a/worker/fetcher.mli b/worker/fetcher.mli
@@ -0,0 +1 @@
+include Obuilder.S.FETCHER
diff --git a/worker/obuilder_build.ml b/worker/obuilder_build.ml
@@ -22,7 +22,6 @@ type t = {
 }
 
 module Sandbox = Obuilder.Sandbox
-module Fetcher = Obuilder.Docker
 
 let ( / ) = Filename.concat
+1 −1		.github/workflows/main.yml
+5 −5		.run-gha-tests.sh
+2 −4		lib/store_spec.ml
-Original file line number
+Diff line change
@@ Expand Up / @@ -22,7 +22,6 @@ type t = { @@
     }
     module Sandbox = Obuilder.Sandbox
-    module Fetcher = Obuilder.Docker
     let ( / ) = Filename.concat
@@ Expand Down @@