MAAS

Merge ~adam-collard/maas:go-modules-machine-resources into maas:master

  1. Git
  2. lp:~adam-collard/maas
  3. go-modules-machine-resources
  4. Merge into master
Proposed by Adam Collard
Status: Merged
Approved by: Adam Collard
Approved revision: bbb00fba3ae3bb280869aa0b86135db37571aeb1
Merge reported by: MAAS Lander
Merged at revision: not available
Proposed branch: ~adam-collard/maas:go-modules-machine-resources
Merge into: maas:master
Diff against target: 23 lines (+2/-3)
1 file modified
src/machine-resources/Makefile (+2/-3)
Reviewer Review Type Date Requested Status
Alberto Donato (community) Approve
Review via email: mp+400108@code.launchpad.net

Commit message

Go build with -mod vendor, fix dependency graph

To post a comment you must log in.
Revision history for this message
Alberto Donato (ack) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/src/machine-resources/Makefile b/src/machine-resources/Makefile
2index 075398b..aa00c91 100644
3--- a/src/machine-resources/Makefile
4+++ b/src/machine-resources/Makefile
5@@ -21,8 +21,8 @@ GO_CACHE_DIR := $(shell [ -d $(HOME)/.cache ] && echo $(HOME)/.cache/go-cache ||
6 .DEFAULT_GOAL := build
7
8 # XXX: Explicitly set GOCACHE to avoid situations where we can't mkdir $HOME/.cache (autopkgtest VM)
9-$(BINARIES):
10- GOCACHE=$(GO_CACHE_DIR) GOARCH=$(DEB_GO_ARCH_$(notdir $@)) go build -ldflags '-s -w' -o $@ $(PACKAGE_DIR)
11+$(BINARIES): vendor
12+ GOCACHE=$(GO_CACHE_DIR) GOARCH=$(DEB_GO_ARCH_$(notdir $@)) go build -mod vendor -ldflags '-s -w' -o $@ $(PACKAGE_DIR)
13
14 build: $(BINARIES)
15 .PHONY: build
16@@ -41,7 +41,6 @@ install: $(BINARIES)
17
18 vendor:
19 go mod vendor
20-.PHONY: vendor
21
22 update-deps:
23 go get -u all

Subscribers

People subscribed via source and target branches