MAAS

Merge ~cgrabowski/maas:fix_snap_build into maas:3.2

  1. Git
  2. lp:~cgrabowski/maas
  3. fix_snap_build
  4. Merge into 3.2
Proposed by Christian Grabowski
Status: Merged
Approved by: Adam Collard
Approved revision: f9c20d109b5af598b4a56f151f2a4e1371357e85
Merge reported by: MAAS Lander
Merged at revision: not available
Proposed branch: ~cgrabowski/maas:fix_snap_build
Merge into: maas:3.2
Diff against target: 13 lines (+1/-1)
1 file modified
src/host-info/Makefile (+1/-1)
Reviewer Review Type Date Requested Status
MAAS Lander Approve
MAAS Maintainers Pending
Review via email: mp+428865@code.launchpad.net

Commit message

add back in the vendor build target dependency

To post a comment you must log in.
Revision history for this message
MAAS Lander (maas-lander) wrote :

UNIT TESTS
-b fix_snap_build lp:~cgrabowski/maas/+git/maas into -b 3.2 lp:~maas-committers/maas

STATUS: SUCCESS
COMMIT: f9c20d109b5af598b4a56f151f2a4e1371357e85

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/src/host-info/Makefile b/src/host-info/Makefile
2index 48a7a93..167f12a 100644
3--- a/src/host-info/Makefile
4+++ b/src/host-info/Makefile
5@@ -32,7 +32,7 @@ GO_BUILD := CGO_ENABLED=0 go build -mod=vendor -ldflags '-s -w -extldflags "-sta
6
7 $(MACHINE_RESOURCES_BINARIES): TARGET_DIR=$(PACKAGE_DIR)
8 $(HARDWARE_SYNC_BINARIES): TARGET_DIR=$(HARDWARE_SYNC_DIR)
9-$(HARDWARE_SYNC_BINARIES) $(MACHINE_RESOURCES_BINARIES):
10+$(HARDWARE_SYNC_BINARIES) $(MACHINE_RESOURCES_BINARIES): vendor
11 GOARCH=$(DEB_GO_ARCH_$(notdir $@)) $(GO_BUILD) -o $@ $(TARGET_DIR)
12
13 build: $(MACHINE_RESOURCES_BINARIES)

Subscribers

People subscribed via source and target branches