Skip to content

Commit 729dc43

Browse files
committed
[FAB-4360] Add release-clean to clean target
When running the e2e_cli, if you have previously built the release artifacts you may encounter issues. Given that it's normal to run make clean prior to tests, etc, adding release-clean to the clean target is required. Also noticed that the generateArtifacts script was building releases for all platforms so modified it to use the target for the current platform it's being run on as well. Change-Id: Ic28ae812b9f9138fb69d75d87de4b1c74f3bcf4b Signed-off-by: Gari Singh <[email protected]>
1 parent ed02047 commit 729dc43

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -351,7 +351,7 @@ protos: buildenv
351351
docker-clean: $(patsubst %,%-docker-clean, $(IMAGES))
352352

353353
.PHONY: clean
354-
clean: docker-clean unit-test-clean
354+
clean: docker-clean unit-test-clean release-clean
355355
-@rm -rf build ||:
356356

357357
.PHONY: dist-clean

examples/e2e_cli/generateArtifacts.sh

+2-2
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ function generateCerts (){
4848
echo "Using cryptogen -> $CRYPTOGEN"
4949
else
5050
echo "Building cryptogen"
51-
make -C $FABRIC_ROOT release-all
51+
make -C $FABRIC_ROOT release
5252
fi
5353

5454
echo
@@ -67,7 +67,7 @@ function generateChannelArtifacts() {
6767
echo "Using configtxgen -> $CONFIGTXGEN"
6868
else
6969
echo "Building configtxgen"
70-
make -C $FABRIC_ROOT release-all
70+
make -C $FABRIC_ROOT release
7171
fi
7272

7373
echo "##########################################################"

0 commit comments

Comments
 (0)