Move ns_minify into separate gomodules directory

Turns out we can't mix go modules and non-modules Go code. Separate out any modules-built code into new deps/gomodules directory. Change-Id: I9a4e6291a378dce3e4c375c4233ef2074f99a167 Reviewed-on: https://review.couchbase.org/c/ns_server/+/165622 Well-Formed: Build Bot <build@couchbase.com> Reviewed-by: Pavel Blagodov <stochmail@gmail.com> Tested-by: Chris Hillery <ceej@couchbase.com>
couchbase · Nov 12, 2021 · 67e34db · 67e34db
1 parent 620b300
commit 67e34db
Show file tree

Hide file tree

Showing 8 changed files with 12 additions and 17 deletions.
diff --git a/deps/CMakeLists.txt b/deps/CMakeLists.txt
@@ -9,4 +9,5 @@ ADD_SUBDIRECTORY (meck)
 ADD_SUBDIRECTORY (ns_babysitter)
 ADD_SUBDIRECTORY (ns_couchdb)
 ADD_SUBDIRECTORY (gocode)
+ADD_SUBDIRECTORY (gomodules)
 ADD_SUBDIRECTORY (chronicle)
diff --git a/deps/gocode/CMakeLists.txt b/deps/gocode/CMakeLists.txt
@@ -18,10 +18,6 @@ GoInstall (TARGET ns_godu PACKAGE godu
   GOVERSION 1.8.5
   INSTALL_PATH bin/priv)
 
-GoModBuild (TARGET ns_minify PACKAGE github.com/couchbase/ns_server/deps/gocode/src/minify
-  GOVERSION 1.13
-  OUTPUT minify)
-
 GoInstall (TARGET ns_gosecrets PACKAGE gosecrets
   GOPATH "${CMAKE_CURRENT_SOURCE_DIR}" "${GODEPSDIR}"
   GOVERSION 1.8.5

diff --git a/deps/gomodules/CMakeLists.txt b/deps/gomodules/CMakeLists.txt
@@ -0,0 +1,2 @@
+ADD_SUBDIRECTORY(minify)
+
diff --git a/deps/gomodules/minify/CMakeLists.txt b/deps/gomodules/minify/CMakeLists.txt
@@ -0,0 +1,4 @@
+GoModBuild (TARGET ns_minify PACKAGE ns_server_minify
+  GOVERSION 1.13
+  OUTPUT minify)
+
diff --git a/go.mod → deps/gomodules/minify/go.mod b/go.mod → deps/gomodules/minify/go.mod
@@ -1,4 +1,4 @@
-module github.com/couchbase/ns_server
+module ns_server_minify
 
 go 1.17
 

diff --git a/deps/gomodules/minify/go.sum b/deps/gomodules/minify/go.sum
@@ -0,0 +1,4 @@
+github.com/evanw/esbuild v0.12.27 h1:pWtTIKGO4Af2P2u6Jps5vmJy1wpUqdx4QmI1Y/fvxY8=
+github.com/evanw/esbuild v0.12.27/go.mod h1:GG+zjdi59yh3ehDn4ZWfPcATxjPDUH53iU4ZJbp7dkY=
+golang.org/x/sys v0.0.0-20210908233432-aa78b53d3365 h1:6wSTsvPddg9gc/mVEEyk9oOAoxn+bT4Z9q1zx+4RwA4=
+golang.org/x/sys v0.0.0-20210908233432-aa78b53d3365/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
diff --git a/deps/gocode/src/minify/main.go → deps/gomodules/minify/main.go b/deps/gocode/src/minify/main.go → deps/gomodules/minify/main.go
diff --git a/go.sum b/go.sum