From e4e9f985f73eced70ec7af38ebffecb882c43a3e Mon Sep 17 00:00:00 2001
From: Marco Munizaga <marco@marcopolo.io>
Date: Mon, 1 May 2023 10:22:25 -0700
Subject: [PATCH] Revert "Bring back zig-libp2p (#172)" (#173)

This reverts commit f0c82d3d816107a7a50e3f403f354b3079e3ece3.
---
 multidim-interop/Makefile                 |  7 ++-----
 multidim-interop/helpers/cache.ts         |  4 ++--
 multidim-interop/impl/zig/.gitignore      |  1 -
 multidim-interop/impl/zig/v0.0.1/Makefile | 19 -------------------
 multidim-interop/versions.ts              |  8 --------
 5 files changed, 4 insertions(+), 35 deletions(-)
 delete mode 100644 multidim-interop/impl/zig/.gitignore
 delete mode 100644 multidim-interop/impl/zig/v0.0.1/Makefile

diff --git a/multidim-interop/Makefile b/multidim-interop/Makefile
index a9cf18d..c0c9f6f 100644
--- a/multidim-interop/Makefile
+++ b/multidim-interop/Makefile
@@ -2,9 +2,8 @@ GO_SUBDIRS := $(wildcard impl/go/*/.)
 JS_SUBDIRS := $(wildcard impl/js/*/.)
 RUST_SUBDIRS := $(wildcard impl/rust/*/.)
 NIM_SUBDIRS := $(wildcard impl/nim/*/.)
-ZIG_SUBDIRS := $(wildcard impl/zig/*/.)
 
-all: $(GO_SUBDIRS) $(JS_SUBDIRS) $(RUST_SUBDIRS) $(NIM_SUBDIRS) $(ZIG_SUBDIRS)
+all: $(GO_SUBDIRS) $(JS_SUBDIRS) $(RUST_SUBDIRS) $(NIM_SUBDIRS)
 $(JS_SUBDIRS):
 	$(MAKE) -C $@
 $(GO_SUBDIRS):
@@ -13,8 +12,6 @@ $(RUST_SUBDIRS):
 	$(MAKE) -C $@
 $(NIM_SUBDIRS):
 	$(MAKE) -C $@
-$(ZIG_SUBDIRS):
-	$(MAKE) -C $@
 
 
-.PHONY: $(GO_SUBDIRS) $(JS_SUBDIRS) $(RUST_SUBDIRS) $(NIM_SUBDIRS) $(ZIG_SUBDIRS) all
+.PHONY: $(GO_SUBDIRS) $(JS_SUBDIRS) $(RUST_SUBDIRS) $(NIM_SUBDIRS) all
diff --git a/multidim-interop/helpers/cache.ts b/multidim-interop/helpers/cache.ts
index de48209..83cb44c 100755
--- a/multidim-interop/helpers/cache.ts
+++ b/multidim-interop/helpers/cache.ts
@@ -106,10 +106,10 @@ switch (modeStr) {
                     console.log("Building any remaining things from image.json")
                     // We're building using -o image.json. This tells make to
                     // not bother building image.json or anything it depends on.
-                    child_process.execSync(`make -o image.json`, { cwd: implFolder, stdio: 'inherit' })
+                    child_process.execSync(`make -o image.json`, { cwd: implFolder })
                 } else {
                     console.log("No cache, building from scratch")
-                    child_process.execSync(`make`, { cwd: implFolder, stdio: "inherit" })
+                    child_process.execSync(`make`, { cwd: implFolder })
                 }
             }
         }
diff --git a/multidim-interop/impl/zig/.gitignore b/multidim-interop/impl/zig/.gitignore
deleted file mode 100644
index 7598f68..0000000
--- a/multidim-interop/impl/zig/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-zig-libp2p-*
diff --git a/multidim-interop/impl/zig/v0.0.1/Makefile b/multidim-interop/impl/zig/v0.0.1/Makefile
deleted file mode 100644
index 22c2e14..0000000
--- a/multidim-interop/impl/zig/v0.0.1/Makefile
+++ /dev/null
@@ -1,19 +0,0 @@
-image_name := zig-v0.0.1
-commitSha := d6c7afe0d02bf8a314547acdf0483653a9b84bea
-
-all: image.json print-cpu-info
-
-print-cpu-info: image.json
-	docker run --rm --entrypoint /app/zig/bin/zig $$(jq -r .imageID image.json) build-exe --show-builtin
-
-image.json:
-	wget -O zig-libp2p-${commitSha}.zip "https://github.com/marcopolo/zig-libp2p/archive/${commitSha}.zip"
-	unzip -o zig-libp2p-${commitSha}.zip
-	cd zig-libp2p-${commitSha} && docker build -t ${image_name} -f interop/Dockerfile .
-	docker image inspect ${image_name} -f "{{.Id}}" | \
-		xargs -I {} echo "{\"imageID\": \"{}\"}" > $@
-
-clean:
-	rm -rf image.json zig-libp2p-*.zip zig-libp2p-*
-
-.PHONY: all clean print-cpu-info
diff --git a/multidim-interop/versions.ts b/multidim-interop/versions.ts
index 8009689..3486669 100644
--- a/multidim-interop/versions.ts
+++ b/multidim-interop/versions.ts
@@ -11,7 +11,6 @@ import jsV042 from "./impl/js/v0.42/node-image.json"
 import nimv10 from "./impl/nim/v1.0/image.json"
 import chromiumJsV041 from "./impl/js/v0.41/chromium-image.json"
 import chromiumJsV042 from "./impl/js/v0.42/chromium-image.json"
-import zigv001 from "./impl/zig/v0.0.1/image.json"
 
 export type Version = {
     id: string,
@@ -115,11 +114,4 @@ export const versions: Array<Version> = [
         secureChannels: ["noise"],
         muxers: ["mplex", "yamux"],
     },
-    {
-        id: "zig-v0.0.1",
-        containerImageID: zigv001.imageID,
-        transports: ["quic-v1"],
-        secureChannels: [],
-        muxers: [],
-    },
 ]