Review: Approve +1
As discussed, I would consider dropping the prefix in the makefile altogether, and renaming the go commands, so that there's less magic involved. But I'm find landing this and doing it later Small nits inline Diff comments: > diff --git a/Makefile b/Makefile > index 68e0262..1652997 100644 > --- a/Makefile > +++ b/Makefile > @@ -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' \ unrelated, but we could drop quotes in this command > --exclude '*.pyc' --exclude '__pycache__' \ > src/ \ > $(SNAP_UNPACKED_DIR)/lib/python3.10/site-packages/ > diff --git a/src/maasagent/Makefile b/src/maasagent/Makefile > index f22503f..21326b3 100644 > --- a/src/maasagent/Makefile > +++ b/src/maasagent/Makefile > @@ -12,7 +12,7 @@ LDFLAGS := -ldflags '-s -w -extldflags "-static"' > export GOCACHE := $(shell [ -d $(HOME)/.cache ] && echo > $(HOME)/.cache/go-cache || mktemp --tmpdir -d tmp.go-cacheXXX) > export GOMODCACHE := $(shell [ -d $(HOME)/go ] && echo $(HOME)/go/pkg/mod || > mktemp --tmpdir -d tmp.go-mod-cacheXXX) > export GOFLAGS := -mod=vendor > -export OUT_PREFIX > +export ARTIFACTS_PREFIX := maas- we don't need to export this anymore, I think > > default: build > -- https://code.launchpad.net/~troyanov/maas/+git/maas/+merge/442585 Your team MAAS Committers is subscribed to branch maas:master. -- Mailing list: https://launchpad.net/~sts-sponsors Post to : [email protected] Unsubscribe : https://launchpad.net/~sts-sponsors More help : https://help.launchpad.net/ListHelp
