ci: use git clean instead of cleanWs() function

This is a continuation of attempts to fix provlems with Windows CI hosts
getting into a broken state due to `.git` directory becoming a file for
random submodules for unknown reason.

Instead of relying on Jenkins functionality of `cleanWs()` function
provided by the [Workspace Cleanup Plugin](https://plugins.jenkins.io/ws-cleanup)
we use Git which should be more reliable, and possibly also speed up the
initial checkout of the repo and submodules.

A nice side-effect is that the repo checkout on all builds after the first
one takes ~1 minute instead of ~5 minutes.

Previous issues:
- https://github.com/status-im/status-desktop/pull/7968
- https://github.com/status-im/status-desktop/pull/8046

Signed-off-by: Jakub Sokołowski <jakub@status.im>
This commit is contained in:
Jakub Sokołowski 2022-11-03 10:36:47 +01:00
parent 09d8a10b49
commit 38f0973dc3
No known key found for this signature in database
GPG Key ID: 09AA5403E54D9931
8 changed files with 11 additions and 7 deletions

View File

@ -608,6 +608,10 @@ clean: | clean-common
rm -rf bin/* node_modules bottles/* pkg/* tmp/* $(STATUSGO) $(STATUSKEYCARDGO) rm -rf bin/* node_modules bottles/* pkg/* tmp/* $(STATUSGO) $(STATUSKEYCARDGO)
+ $(MAKE) -C vendor/DOtherSide/build --no-print-directory clean + $(MAKE) -C vendor/DOtherSide/build --no-print-directory clean
clean-git:
git clean -fdx
git submodule foreach --recursive git clean -fdx
force-rebuild-status-go: force-rebuild-status-go:
bash ./scripts/force-rebuild-status-go.sh $(STATUSGO) bash ./scripts/force-rebuild-status-go.sh $(STATUSGO)

View File

@ -96,6 +96,6 @@ pipeline {
post { post {
success { script { github.notifyPR(true) } } success { script { github.notifyPR(true) } }
failure { script { github.notifyPR(false) } } failure { script { github.notifyPR(false) } }
cleanup { cleanWs() } cleanup { sh 'make clean-git' }
} }
} }

View File

@ -85,6 +85,6 @@ pipeline {
post { post {
success { script { github.notifyPR(true) } } success { script { github.notifyPR(true) } }
failure { script { github.notifyPR(false) } } failure { script { github.notifyPR(false) } }
cleanup { cleanWs() } cleanup { sh 'make clean-git' }
} }
} }

View File

@ -108,6 +108,6 @@ pipeline {
post { post {
success { script { github.notifyPR(true) } } success { script { github.notifyPR(true) } }
failure { script { github.notifyPR(false) } } failure { script { github.notifyPR(false) } }
cleanup { cleanWs() } cleanup { sh 'make clean-git' }
} }
} }

View File

@ -77,6 +77,6 @@ pipeline {
post { post {
success { script { github.notifyPR(true) } } success { script { github.notifyPR(true) } }
failure { script { github.notifyPR(false) } } failure { script { github.notifyPR(false) } }
cleanup { cleanWs() } cleanup { sh 'make clean-git' }
} }
} }

View File

@ -145,6 +145,6 @@ pipeline {
post { post {
success { script { github.notifyPR(true) } } success { script { github.notifyPR(true) } }
failure { script { github.notifyPR(false) } } failure { script { github.notifyPR(false) } }
cleanup { cleanWs() } cleanup { sh 'make clean-git' }
} }
} }

View File

@ -99,6 +99,6 @@ pipeline {
post { post {
success { script { github.notifyPR(true) } } success { script { github.notifyPR(true) } }
failure { script { github.notifyPR(false) } } failure { script { github.notifyPR(false) } }
cleanup { cleanWs(disableDeferredWipeout: true, deleteDirs: true) } cleanup { sh 'make clean-git' }
} }
} }

View File

@ -78,6 +78,6 @@ pipeline {
post { post {
success { script { github.notifyPR(true) } } success { script { github.notifyPR(true) } }
failure { script { github.notifyPR(false) } } failure { script { github.notifyPR(false) } }
cleanup { cleanWs() } cleanup { sh 'make clean-git' }
} }
} }