From 67e34dbb512c74f99a9a3129f3ddb1427f6da781 Mon Sep 17 00:00:00 2001 From: Chris Hillery Date: Fri, 12 Nov 2021 02:52:27 -0800 Subject: [PATCH] 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 Reviewed-by: Pavel Blagodov Tested-by: Chris Hillery --- deps/CMakeLists.txt | 1 + deps/gocode/CMakeLists.txt | 4 ---- deps/gomodules/CMakeLists.txt | 2 ++ deps/gomodules/minify/CMakeLists.txt | 4 ++++ go.mod => deps/gomodules/minify/go.mod | 2 +- deps/gomodules/minify/go.sum | 4 ++++ deps/{gocode/src => gomodules}/minify/main.go | 0 go.sum | 12 ------------ 8 files changed, 12 insertions(+), 17 deletions(-) create mode 100644 deps/gomodules/CMakeLists.txt create mode 100644 deps/gomodules/minify/CMakeLists.txt rename go.mod => deps/gomodules/minify/go.mod (57%) create mode 100644 deps/gomodules/minify/go.sum rename deps/{gocode/src => gomodules}/minify/main.go (100%) delete mode 100644 go.sum diff --git a/deps/CMakeLists.txt b/deps/CMakeLists.txt index bbf2159f5f..7702e939a8 100644 --- 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 index 1d7a446de4..6b59345a48 100644 --- 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 new file mode 100644 index 0000000000..0dbe871e21 --- /dev/null +++ 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 new file mode 100644 index 0000000000..00df8b825c --- /dev/null +++ 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 b/deps/gomodules/minify/go.mod similarity index 57% rename from go.mod rename to deps/gomodules/minify/go.mod index b54e2b5fdf..dc192703ac 100644 --- a/go.mod +++ b/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 new file mode 100644 index 0000000000..0b73496985 --- /dev/null +++ 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 b/deps/gomodules/minify/main.go similarity index 100% rename from deps/gocode/src/minify/main.go rename to deps/gomodules/minify/main.go diff --git a/go.sum b/go.sum deleted file mode 100644 index f400bb605f..0000000000 --- a/go.sum +++ /dev/null @@ -1,12 +0,0 @@ -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/crypto v0.0.0-20210921155107-089bfa567519 h1:7I4JAnoQBe7ZtJcBaYHi5UtiO8tQHbUSXxL+pnGRANg= -golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= -golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= -golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -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= -golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= -golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= -golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=