use gomod support w/ xgo (#14836)

diff --git a/.drone.yml b/.drone.yml
index f64f5e67107b614cb971ba99b12e68182d8a8410..3ad3e153258468580e6f865af739ec82a92e9f79 100644 (file)
--- a/.drone.yml
+++ b/.drone.yml
@@ -480,6 +480,9 @@ platform:
   os: linux
   arch: amd64
 
+workspace:
+  path: /source
+
 trigger:
   branch:
     - master
@@ -574,6 +577,9 @@ platform:
   os: linux
   arch: amd64
 
+workspace:
+  path: /source
+
 trigger:
   event:
     - tag

diff --git a/Makefile b/Makefile
index 5577597678b8c1435011f866bcccebe16efcc6c7..527320ee525fd8d115264181970d99b6789cc211 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -574,9 +574,9 @@ $(DIST_DIRS):
 .PHONY: release-windows
 release-windows: | $(DIST_DIRS)
        @hash xgo > /dev/null 2>&1; if [ $$? -ne 0 ]; then \
-               GO111MODULE=off $(GO) get -u src.techknowlogick.com/xgo; \
+               $(GO) install src.techknowlogick.com/xgo@latest; \
        fi
-       CGO_CFLAGS="$(CGO_CFLAGS)" GO111MODULE=off xgo -go $(XGO_VERSION) -buildmode exe -dest $(DIST)/binaries -tags 'netgo osusergo $(TAGS)' -ldflags '-linkmode external -extldflags "-static" $(LDFLAGS)' -targets 'windows/*' -out gitea-$(VERSION) .
+       CGO_CFLAGS="$(CGO_CFLAGS)" xgo -go $(XGO_VERSION) -buildmode exe -dest $(DIST)/binaries -tags 'netgo osusergo $(TAGS)' -ldflags '-linkmode external -extldflags "-static" $(LDFLAGS)' -targets 'windows/*' -out gitea-$(VERSION) .
 ifeq ($(CI),drone)
        cp /build/* $(DIST)/binaries
 endif
@@ -584,9 +584,9 @@ endif
 .PHONY: release-linux
 release-linux: | $(DIST_DIRS)
        @hash xgo > /dev/null 2>&1; if [ $$? -ne 0 ]; then \
-               GO111MODULE=off $(GO) get -u src.techknowlogick.com/xgo; \
+               $(GO) install src.techknowlogick.com/xgo@latest; \
        fi
-       CGO_CFLAGS="$(CGO_CFLAGS)" GO111MODULE=off xgo -go $(XGO_VERSION) -dest $(DIST)/binaries -tags 'netgo osusergo $(TAGS)' -ldflags '-linkmode external -extldflags "-static" $(LDFLAGS)' -targets '$(LINUX_ARCHS)' -out gitea-$(VERSION) .
+       CGO_CFLAGS="$(CGO_CFLAGS)" xgo -go $(XGO_VERSION) -dest $(DIST)/binaries -tags 'netgo osusergo $(TAGS)' -ldflags '-linkmode external -extldflags "-static" $(LDFLAGS)' -targets '$(LINUX_ARCHS)' -out gitea-$(VERSION) .
 ifeq ($(CI),drone)
        cp /build/* $(DIST)/binaries
 endif
@@ -594,9 +594,9 @@ endif
 .PHONY: release-darwin
 release-darwin: | $(DIST_DIRS)
        @hash xgo > /dev/null 2>&1; if [ $$? -ne 0 ]; then \
-               GO111MODULE=off $(GO) get -u src.techknowlogick.com/xgo; \
+               $(GO) install src.techknowlogick.com/xgo@latest; \
        fi
-       CGO_CFLAGS="$(CGO_CFLAGS)" GO111MODULE=off xgo -go $(XGO_VERSION) -dest $(DIST)/binaries -tags 'netgo osusergo $(TAGS)' -ldflags '$(LDFLAGS)' -targets 'darwin-10.12/amd64' -out gitea-$(VERSION) .
+       CGO_CFLAGS="$(CGO_CFLAGS)" xgo -go $(XGO_VERSION) -dest $(DIST)/binaries -tags 'netgo osusergo $(TAGS)' -ldflags '$(LDFLAGS)' -targets 'darwin-10.12/amd64' -out gitea-$(VERSION) .
 ifeq ($(CI),drone)
        cp /build/* $(DIST)/binaries
 endif