From cb3a88f93a445303ea63e82d363ac7b21e618bd9 Mon Sep 17 00:00:00 2001 From: Ivan Belyakov Date: Thu, 2 Nov 2023 18:20:35 +0100 Subject: [PATCH] fix(build): avoid removing untracked git changes by `make clean` Use `make deep-clean` for deep cleaning --- Makefile | 4 +++- _assets/ci/Jenkinsfile.android | 2 +- _assets/ci/Jenkinsfile.ios | 2 +- _assets/ci/Jenkinsfile.linux | 2 +- 4 files changed, 6 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 7f034faff..5f162270c 100644 --- a/Makefile +++ b/Makefile @@ -347,9 +347,11 @@ ci-race: lint canary-test test-unit test-e2e-race ##@tests Run all linters and t clean: ##@other Cleanup rm -fr build/bin/* mailserver-config.json + +git-clean: git clean -xf -deep-clean: clean +deep-clean: clean git-clean rm -Rdf .ethereumtest/StatusChain tidy: diff --git a/_assets/ci/Jenkinsfile.android b/_assets/ci/Jenkinsfile.android index 8412e2e07..4f751fbaf 100644 --- a/_assets/ci/Jenkinsfile.android +++ b/_assets/ci/Jenkinsfile.android @@ -68,6 +68,6 @@ pipeline { post { success { script { github.notifyPR(true) } } failure { script { github.notifyPR(false) } } - cleanup { sh 'make clean' } + cleanup { sh 'make deep-clean' } } // post } // pipeline diff --git a/_assets/ci/Jenkinsfile.ios b/_assets/ci/Jenkinsfile.ios index 0747d6952..4c114b8d2 100644 --- a/_assets/ci/Jenkinsfile.ios +++ b/_assets/ci/Jenkinsfile.ios @@ -73,6 +73,6 @@ pipeline { post { success { script { github.notifyPR(true) } } failure { script { github.notifyPR(false) } } - cleanup { sh 'make clean' } + cleanup { sh 'make deep-clean' } } // post } // pipeline diff --git a/_assets/ci/Jenkinsfile.linux b/_assets/ci/Jenkinsfile.linux index ee1185aea..0f8133bad 100644 --- a/_assets/ci/Jenkinsfile.linux +++ b/_assets/ci/Jenkinsfile.linux @@ -75,6 +75,6 @@ pipeline { post { success { script { github.notifyPR(true) } } failure { script { github.notifyPR(false) } } - cleanup { sh 'make clean' } + cleanup { sh 'make deep-clean' } } // post } // pipeline