From 18331d5687d5416d692b9b894c28778400a1ad40 Mon Sep 17 00:00:00 2001 From: Caleb Maclennan Date: Tue, 27 Aug 2024 00:37:16 +0300 Subject: [PATCH] fix(build): Drop duplicate targets supplied by reusable include --- Makefile.am | 19 +------------------ 1 file changed, 1 insertion(+), 18 deletions(-) diff --git a/Makefile.am b/Makefile.am index 2c739c90..39fb8642 100644 --- a/Makefile.am +++ b/Makefile.am @@ -162,7 +162,7 @@ casile-%.md: CHANGELOG.md $(SED) -e '/\.\.\.v$*/,/\.\.\.v/!d' $< | \ $(SED) -e '1,3d;N;$$!P;$$!D;$$d' > $@ -PHONY_DEVELOPER_TARGETS = lint luacheck stylua checkmake ruff +PHONY_DEVELOPER_TARGETS = lint luacheck stylua checkmake ruff ruff-format PHONY_DEVELOPER_TARGETS += tagrelease release-preview release PHONY_DEVELOPER_TARGETS += docker docker-dep-check docker-ghcr-to-hub docker-build-push .PHONY: $(PHONY_DEVELOPER_TARGETS) @@ -225,28 +225,11 @@ CLEANFILES += .aur_deps $(GREP) -v 'so.$$' | \ $(SORT) > $@ -define docker_push = - test -z "$(DOCKER_PAT)" || \ - $(DOCKER) login https://$(DOCKER_REGISTRY) -u $(DOCKER_USERNAME) -p $(DOCKER_PAT) - $(DOCKER) push $(DOCKER_REGISTRY)/$(DOCKER_REPO):$(DOCKER_TAG) - if [[ "$(DOCKER_TAG)" == v*.*.* ]]; then \ - tag=$(DOCKER_TAG) ; \ - $(DOCKER) tag $(DOCKER_REPO):$(DOCKER_TAG) $(DOCKER_REGISTRY)/$(DOCKER_REPO):latest ; \ - $(DOCKER) tag $(DOCKER_REPO):$(DOCKER_TAG) $(DOCKER_REGISTRY)/$(DOCKER_REPO):$${tag//.*} ; \ - $(DOCKER) push $(DOCKER_REGISTRY)/$(DOCKER_REPO):latest ; \ - $(DOCKER) push $(DOCKER_REGISTRY)/$(DOCKER_REPO):$${tag//.*} ; \ - fi -endef - docker-ghcr-to-hub: $(DOCKER) pull $(GHCR_REGISTRY)/$(GHCR_REPO):$(DOCKER_TAG) $(DOCKER) tag $(GHCR_REGISTRY)/$(GHCR_REPO):$(DOCKER_TAG) $(DOCKER_REGISTRY)/$(DOCKER_REPO):$(DOCKER_TAG) $(docker_push) -docker-build-push: docker - $(DOCKER) tag $(DOCKER_REPO):$(DOCKER_TAG) $(DOCKER_REGISTRY)/$(DOCKER_REPO):$(DOCKER_TAG) - $(docker_push) - else !DEVELOPER_MODE $(PHONY_DEVELOPER_TARGETS):