Anton Troyanov has proposed merging ~troyanov/maas:netmon-snap-tree-sync into maas:master.
Commit message: fix: sync netmon binary during snap-tree-sync Requested reviews: MAAS Maintainers (maas-maintainers) For more details, see: https://code.launchpad.net/~troyanov/maas/+git/maas/+merge/442585 -- Your team MAAS Committers is subscribed to branch maas:master.
diff --git a/Makefile b/Makefile index 68e0262..dd5e1fe 100644 --- a/Makefile +++ b/Makefile @@ -131,7 +131,7 @@ swagger-css: $(swagger-dist) go-bins: $(MAKE) -j -C src/host-info build - $(MAKE) -j -C src/maasagent build + $(MAKE) -j -C src/maasagent build OUT_PREFIX=maas- .PHONY: go-bins test: test-missing-migrations test-py lint-oapi test-go @@ -419,7 +419,8 @@ $(SNAP_FILE): snap-tree-sync: RSYNC := rsync -v -r -u -l -t -W -L snap-tree-sync: $(UI_BUILD) go-bins $(SNAP_UNPACKED_DIR_MARKER) $(RSYNC) --exclude 'maastesting' --exclude 'tests' --exclude 'testing' \ - --exclude 'maasui' --exclude 'machine-resources' --exclude 'host-info' --exclude 'maas-offline-docs' \ + --exclude 'maasui' --exclude 'maasagent' --exclude 'machine-resources' \ + --exclude 'host-info' --exclude 'maas-offline-docs' \ --exclude '*.pyc' --exclude '__pycache__' \ src/ \ $(SNAP_UNPACKED_DIR)/lib/python3.10/site-packages/ @@ -435,6 +436,9 @@ snap-tree-sync: $(UI_BUILD) go-bins $(SNAP_UNPACKED_DIR_MARKER) $(RSYNC) \ src/host-info/bin/ \ $(SNAP_UNPACKED_DIR)/usr/share/maas/machine-resources/ + $(RSYNC) \ + src/maasagent/build/ \ + $(SNAP_UNPACKED_DIR)/usr/sbin/ .PHONY: snap-tree-sync $(BIN_DIR)/golangci-lint: GOLANGCI_VERSION=1.51.2 diff --git a/src/maasagent/Makefile b/src/maasagent/Makefile index f22503f..771dd2b 100644 --- a/src/maasagent/Makefile +++ b/src/maasagent/Makefile @@ -22,10 +22,10 @@ ARTIFACTS := $(subst /,,$(subst cmd/,,$(wildcard cmd/*/))) .PHONY: build build: vendor - $(MAKE) $(addprefix $(BUILD_DIR)/,$(ARTIFACTS)) + $(MAKE) $(addprefix $(BUILD_DIR)/$(OUT_PREFIX),$(ARTIFACTS)) -$(BUILD_DIR)/%: - CGO_ENABLED=0 $(GO) build -o $(BUILD_DIR)/$(OUT_PREFIX)$* $(LDFLAGS) cmd/$*/*.go +$(BUILD_DIR)/$(OUT_PREFIX)%: + CGO_ENABLED=0 $(GO) build -o $(BUILD_DIR)/$* $(LDFLAGS) cmd/$*/*.go .PHONY: install install: build
-- Mailing list: https://launchpad.net/~sts-sponsors Post to : [email protected] Unsubscribe : https://launchpad.net/~sts-sponsors More help : https://help.launchpad.net/ListHelp
