From 0393d4006e2ce614674f7782a0a6a00b49b304d3 Mon Sep 17 00:00:00 2001 From: Dave Vandyke Date: Tue, 28 Mar 2023 17:20:31 +0100 Subject: [PATCH] Revert recent change to clean target in Makefile (#1832) There was a bug in the Makefile, whereby `make clean` would run `rm -rf $(BUILD_DIR)` which usually resulted in `rm -rf build//` being run. By happenstance this worked, clearing the build directory. I fixed that, by changing the script to run `rm -rf build` directly. However, it turns out that the release target also runs `make clean`, but with the BUILD_DIR variable set correctly. It expected only the targetted build to be cleared, so when the whole build directory was cleared instead the release process failed. For now, let's revert that change, to unblock today's release. In the future, we should handle this properly. --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 35f9aef840..4a4cc3731d 100755 --- a/Makefile +++ b/Makefile @@ -95,7 +95,7 @@ npm: ## clean: Clear the builds and temporary files. clean: rm -f shared/data/smarter_encryption.txt shared/data/bundled/smarter-encryption-rules.json integration-test/artifacts/attribution.json: - rm -rf build + rm -rf $(BUILD_DIR) .PHONY: clean