Merge pull request #197 from Hywan/fix-mod-vendor

fix(go) Force `go mod vendor` to copy the `packaged/` directory.
wasmerio · Feb 11, 2021 · bba4ae1 · bba4ae1
2 parents 786400f + 6955e6d
commit bba4ae1
Show file tree

Hide file tree

Showing 8 changed files with 22 additions and 2 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -38,8 +38,6 @@ jobs:
           default: true
           override: true
 
-      - uses: Swatinem/rust-cache@v1
-
       - name: Set up Go
         uses: actions/setup-go@v2
         with:

diff --git a/wasmer/cgo.go b/wasmer/cgo.go
@@ -11,3 +11,9 @@ package wasmer
 //
 // #include <wasmer_wasm.h>
 import "C"
+
+// See https://github.com/golang/go/issues/26366.
+import (
+	_ "github.com/wasmerio/wasmer-go/wasmer/packaged/include"
+	_ "github.com/wasmerio/wasmer-go/wasmer/packaged/lib"
+)
diff --git a/wasmer/packaged/include/dummy.go b/wasmer/packaged/include/dummy.go
@@ -0,0 +1,2 @@
+// See https://github.com/golang/go/issues/26366.
+package include
diff --git a/wasmer/packaged/lib/darwin-aarch64/libwasmer.dylib b/wasmer/packaged/lib/darwin-aarch64/libwasmer.dylib
diff --git a/wasmer/packaged/lib/darwin-amd64/dummy.go b/wasmer/packaged/lib/darwin-amd64/dummy.go
@@ -0,0 +1,2 @@
+// See https://github.com/golang/go/issues/26366.
+package darwin_amd64
diff --git a/wasmer/packaged/lib/dummy.go b/wasmer/packaged/lib/dummy.go
@@ -0,0 +1,8 @@
+// See https://github.com/golang/go/issues/26366.
+package lib
+
+import (
+	_ "github.com/wasmerio/wasmer-go/wasmer/packaged/lib/darwin-amd64"
+	_ "github.com/wasmerio/wasmer-go/wasmer/packaged/lib/linux-aarch64"
+	_ "github.com/wasmerio/wasmer-go/wasmer/packaged/lib/linux-amd64"
+)
diff --git a/wasmer/packaged/lib/linux-aarch64/dummy.go b/wasmer/packaged/lib/linux-aarch64/dummy.go
@@ -0,0 +1,2 @@
+// See https://github.com/golang/go/issues/26366.
+package linux_aarch64
diff --git a/wasmer/packaged/lib/linux-amd64/dummy.go b/wasmer/packaged/lib/linux-amd64/dummy.go
@@ -0,0 +1,2 @@
+// See https://github.com/golang/go/issues/26366.
+package linux_amd64