summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKir Kolyshkin <kolyshkin@gmail.com>2022-04-13 17:32:15 -0700
committerKir Kolyshkin <kolyshkin@gmail.com>2022-05-17 13:42:03 -0700
commit40a1cd4efb97c431df226dd1b88b359bd7de7df1 (patch)
tree58dbd8960fe0441e49652f76177b2ed47066aa76
parentd49efde27e577708bf5a7ea8aa686099717ae41b (diff)
downloadpodman-40a1cd4efb97c431df226dd1b88b359bd7de7df1.tar.gz
podman-40a1cd4efb97c431df226dd1b88b359bd7de7df1.tar.bz2
podman-40a1cd4efb97c431df226dd1b88b359bd7de7df1.zip
Remove GO111MODULES use
Using it is no longer needed. Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
-rw-r--r--Makefile8
-rw-r--r--pkg/api/Makefile2
2 files changed, 4 insertions, 6 deletions
diff --git a/Makefile b/Makefile
index 63d1342b8..fa9b28bf0 100644
--- a/Makefile
+++ b/Makefile
@@ -254,9 +254,9 @@ build-all-new-commits:
.PHONY: vendor
vendor:
- GO111MODULE=on $(GO) mod tidy
- GO111MODULE=on $(GO) mod vendor
- GO111MODULE=on $(GO) mod verify
+ $(GO) mod tidy
+ $(GO) mod vendor
+ $(GO) mod verify
.PHONY: vendor-in-container
vendor-in-container:
@@ -372,7 +372,7 @@ rootlessport: bin/rootlessport
.PHONY: generate-bindings
generate-bindings:
ifneq ($(GOOS),darwin)
- GO111MODULE=off $(GOCMD) generate ./pkg/bindings/... ;
+ $(GOCMD) generate ./pkg/bindings/... ;
endif
# DO NOT USE: use local-cross instead
diff --git a/pkg/api/Makefile b/pkg/api/Makefile
index 6da5fb57e..d07cf6f93 100644
--- a/pkg/api/Makefile
+++ b/pkg/api/Makefile
@@ -1,5 +1,3 @@
-export GO111MODULE=off
-
SWAGGER_OUT ?= swagger.yaml
validate: ${SWAGGER_OUT}