Merge pull request #459 from canonical/remove-go111module

chore: GO111MODULE removed
canonical · Nov 13, 2024 · e175f23 · e175f23
2 parents c80436a + 538921f
commit e175f23
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 5 deletions.
diff --git a/.github/workflows/publish.yaml b/.github/workflows/publish.yaml
@@ -84,8 +84,6 @@ jobs:
           go install github.com/mikefarah/yq/[email protected]
           echo "OCI_FACTORY=$(go env GOPATH)/bin/oci-factory" >> $GITHUB_ENV
           echo "YQ=$(go env GOPATH)/bin/yq" >> $GITHUB_ENV
-        env:
-          GO111MODULE: "on"
       - name: Set EOLs and version
         run: |
           echo EOL_STABLE=$(date -d "$(date +'%Y-%m-%d') +6 month" "+%Y-%m-%d") >> $GITHUB_ENV

diff --git a/Makefile b/Makefile
@@ -1,4 +1,3 @@
-GO111MODULE?=on
 CGO_ENABLED?=0
 GOOS?=linux
 GO_BIN?=app

diff --git a/cmd/Makefile b/cmd/Makefile
@@ -1,4 +1,3 @@
-GO111MODULE?=on
 CGO_ENABLED?=0
 GOOS?=linux
 GO_BIN?=app
@@ -11,4 +10,4 @@ GOFLAGS?=-ldflags=-w -ldflags=-s -a -buildvcs
 build:
 	$(GO) build -o $(GO_BIN) ./
 
-.PHONY=build
+.PHONY=build