diff options
| author | Alejandro Colomar <alx.manpages@gmail.com> | 2021-03-30 00:59:40 +0200 |
|---|---|---|
| committer | Alejandro Colomar <alx.manpages@gmail.com> | 2021-03-30 01:00:52 +0200 |
| commit | 42e11b857fe2e66ccbc21bac85da836789483b0d (patch) | |
| tree | 56d59238f0071ed17b901107e92a63a08968b0f2 | |
| parent | 39495c692233870651afbb77130354edf733c073 (diff) | |
Makefile: rm 'config' target; fix dependencies
Signed-off-by: Alejandro Colomar <alx.manpages@gmail.com>
| -rw-r--r-- | .github/workflows/ci-push.yaml | 3 | ||||
| -rw-r--r-- | Makefile | 9 |
2 files changed, 3 insertions, 9 deletions
diff --git a/.github/workflows/ci-push.yaml b/.github/workflows/ci-push.yaml index ee3f8cd..b7b93f8 100644 --- a/.github/workflows/ci-push.yaml +++ b/.github/workflows/ci-push.yaml @@ -31,9 +31,6 @@ jobs: name: release_test run: ./bin/release_test 'ci'; - - name: make config - run: make config; - - name: make image run: make image; - @@ -51,9 +51,6 @@ project = $(shell <$(CURDIR)/.config grep '^project' | cut -f2) .PHONY: all all: man -.PHONY: config -config: Dockerfile digest submodules - .PHONY: Dockerfile Dockerfile: @echo ' Update Dockerfile ARGs'; @@ -82,7 +79,7 @@ submodules: git submodule init && git submodule update; .PHONY: man -man: +man: submodules $(MAKE) -C src/man-pages/ html HTOPTS='-r'; .PHONY: clean-man @@ -113,7 +110,7 @@ install-man: $(MAKE) -C src/man-pages/ install-html htmldir='$(wwwdir)/share/'; .PHONY: image -image: Dockerfile +image: Dockerfile submodules @echo ' DOCKER image build $(img_)'; @docker image build -t '$(img_)' $(CURDIR); @@ -133,7 +130,7 @@ image-manifest-push: @docker manifest push '$(img)'; .PHONY: stack-deploy -stack-deploy: +stack-deploy: digest @echo ' STACK deploy $(orchestrator) $(stack)'; @alx_stack_deploy -o '$(orchestrator)' '$(stack)'; |