Merge remote-tracking branch 'origin/pr/123'

Author: samuelkarp

agent/Makefile

@@ -11,9 +11,12 @@
 # express or implied. See the License for the specific language governing
 # permissions and limitations under the License.
 
+GOMOD := $(shell go env GOMOD)
+GOSUM := $(GOMOD:.mod=.sum)
+
 all: agent
 
-agent: *.go
+agent: *.go $(GOMOD) $(GOSUM)
 ifneq ($(STATIC_AGENT),)
 	CGO_ENABLED=0 go build -installsuffix cgo -a -ldflags "-s" -o agent
 else

examples/Makefile

@@ -11,11 +11,14 @@
 # express or implied. See the License for the specific language governing
 # permissions and limitations under the License.
 
+GOMOD := $(shell go env GOMOD)
+GOSUM := $(GOMOD:.mod=.sum)
+
 all: examples
 
 examples: taskworkflow
 
-taskworkflow: taskworkflow.go
+taskworkflow: taskworkflow.go $(GOMOD) $(GOSUM)
 	go build -o taskworkflow taskworkflow.go
 
 clean:

runtime/Makefile

@@ -15,12 +15,14 @@
 EXTRAGOARGS:=
 
 SOURCES:=$(shell find . -name '*.go')
+GOMOD := $(shell go env GOMOD)
+GOSUM := $(GOMOD:.mod=.sum)
 
 all: runtime
 
 runtime: containerd-shim-aws-firecracker
 
-containerd-shim-aws-firecracker: $(SOURCES)
+containerd-shim-aws-firecracker: $(SOURCES) $(GOMOD) $(GOSUM)
 	go build -o containerd-shim-aws-firecracker
 
 install: containerd-shim-aws-firecracker

snapshotter/Makefile

@@ -16,6 +16,8 @@ EXTRAGOARGS:=
 
 SUBDIRS:=cmd/devmapper cmd/naive
 SOURCES:=$(shell find . -name '*.go')
+GOMOD := $(shell go env GOMOD)
+GOSUM := $(GOMOD:.mod=.sum)
 
 all: $(SUBDIRS)
 
@@ -25,10 +27,10 @@ $(SUBDIRS):
 install: $(SUBDIRS)
 	for d in $(SUBDIRS); do $(MAKE) -C $$d install; done
 
-test: $(SOURCES)
+test: $(SOURCES) $(GOMOD) $(GOSUM)
 	go test ./... $(EXTRAGOARGS)
 
 clean:
 	for d in $(SUBDIRS); do $(MAKE) -C $$d clean; done
 
-.PHONY: all $(SUBDIRS) clean install
+.PHONY: all $(SUBDIRS) clean install test

snapshotter/cmd/devmapper/Makefile

@@ -11,9 +11,12 @@
 # express or implied. See the License for the specific language governing
 # permissions and limitations under the License.
 
+GOMOD := $(shell go env GOMOD)
+GOSUM := $(GOMOD:.mod=.sum)
+
 all: devmapper_snapshotter
 
-devmapper_snapshotter: *.go
+devmapper_snapshotter: *.go $(GOMOD) $(GOSUM)
 	go build -o devmapper_snapshotter
 
 install: devmapper_snapshotter

snapshotter/cmd/naive/Makefile

@@ -11,9 +11,12 @@
 # express or implied. See the License for the specific language governing
 # permissions and limitations under the License.
 
+GOMOD := $(shell go env GOMOD)
+GOSUM := $(GOMOD:.mod=.sum)
+
 all: naive_snapshotter
 
-naive_snapshotter: *.go
+naive_snapshotter: *.go $(GOMOD) $(GOSUM)
 	go build -o naive_snapshotter
 
 install: naive_snapshotter