From b7388d3b465401bd9a6b5a68b35076bd9cb01b36 Mon Sep 17 00:00:00 2001 From: Martin Schulze Date: Sat, 17 Oct 2020 01:17:07 +0200 Subject: [PATCH] Remove obsolete make target --- .github/CONTRIBUTING.md | 2 +- Makefile | 11 +++-------- 2 files changed, 4 insertions(+), 9 deletions(-) diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md index 2c225fcf..aee54474 100644 --- a/.github/CONTRIBUTING.md +++ b/.github/CONTRIBUTING.md @@ -13,7 +13,7 @@ Here's a quick guide: refactoring and documentation changes require no new tests. If you are adding functionality or fixing a bug, we need tests! -4. Run the tests. `make build-no-cache generate-accounts run generate-accounts-after-run fixtures tests clean` +4. Run the tests. `make build-no-cache generate-accounts run fixtures tests clean` 5. Push to your fork and submit a pull request. If the changes will apply cleanly to the master branch, you will only need to submit one pull request. diff --git a/Makefile b/Makefile index 19a3c11f..366d2390 100644 --- a/Makefile +++ b/Makefile @@ -6,9 +6,9 @@ VCS_VERSION := $(shell git describe --tags --contains --always) SLEEP = 15s -all: build backup generate-accounts generate-accounts-after-run tests clean -no-build: backup generate-accounts generate-accounts-after-run tests clean -complete_test: lint build generate-accounts generate-accounts-after-run tests +all: build backup generate-accounts tests clean +no-build: backup generate-accounts tests clean +complete_test: lint build generate-accounts tests build: docker build \ @@ -28,11 +28,6 @@ generate-accounts: @ echo "# this is a test comment, please don't delete me :'(" >> test/config/postfix-accounts.cf @ echo " # this is also a test comment, :O" >> test/config/postfix-accounts.cf -# TODO: ensure this is run per container after each container started! -generate-accounts-after-run: - # todo: noone seems to care about this? - #@ docker run --rm -e MAIL_USER=added@localhost.localdomain -e MAIL_PASS=mypassword -t $(NAME) /bin/sh -c 'echo "$$MAIL_USER|$$(doveadm pw -s SHA512-CRYPT -u $$MAIL_USER -p $$MAIL_PASS)"' >> test/config/postfix-accounts.cf - @ sleep $(SLEEP) tests: ./test/bats/bin/bats test/*.bats