Don't use goproxy when building in AWS

Change-Id: Id9fd0ad1ab2db4266dcd67dfda9e7283f997db46 Reviewed-on: http://review.couchbase.org/c/tlm/+/159560 Reviewed-by: Blair Watt <blair.watt@couchbase.com> Tested-by: Chris Hillery <ceej@couchbase.com>
couchbase · Aug 18, 2021 · 4b5ed5e · 4b5ed5e
1 parent 80fc349
commit 4b5ed5e
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/cmake/Modules/go-modbuild.cmake b/cmake/Modules/go-modbuild.cmake
@@ -68,7 +68,8 @@ SET (ENV{GO111MODULE} "on")
 SET (ENV{GOCACHE} "${GO_BINARY_DIR}/cache")
 
 # If this is a production build, set/override GOPROXY.
-IF (CB_PRODUCTION_BUILD)
+# (For now, not on AWS since it doesn't have access to our proxy.)
+IF (CB_PRODUCTION_BUILD AND NOT EXISTS "/aws")
   SET (ENV{GOPROXY} "http://goproxy.build.couchbase.com/")
 ENDIF ()
 

diff --git a/cmake/Modules/go-modtidy.cmake b/cmake/Modules/go-modtidy.cmake
@@ -11,7 +11,8 @@ SET (ENV{GOPATH} "${GO_BINARY_DIR}")
 SET (ENV{GOCACHE} "${GO_BINARY_DIR}/cache")
 
 # If this is a production build, set/override GOPROXY.
-IF (CB_PRODUCTION_BUILD)
+# (For now, not on AWS since it doesn't have access to our proxy.)
+IF (CB_PRODUCTION_BUILD AND NOT EXISTS "/aws")
   SET (ENV{GOPROXY} "http://goproxy.build.couchbase.com/")
 ENDIF ()