Ensure watchman watch is removed after Jenkins build

This commit is contained in:
Pedro Pombeiro 2019-06-11 11:43:44 +02:00
parent 7097de6e05
commit f5be5c3a69
No known key found for this signature in database
GPG Key ID: C4A24185B2AA48A1
7 changed files with 8 additions and 21 deletions

View File

@ -49,6 +49,9 @@ clean-nix: SHELL := /bin/sh
clean-nix: ##@prepare Remove complete nix setup
sudo rm -rf /nix ~/.nix-profile ~/.nix-defexpr ~/.nix-channels ~/.cache/nix ~/.status .nix-gcroots
watchman-clean:
watchman watch-del $(PWD)
add-gcroots: ##@prepare Add Nix GC roots to avoid status-react expressions being garbage collected
scripts/add-gcroots.sh

View File

@ -103,6 +103,7 @@ pipeline {
}
stage('Cleanup') {
steps {
sh 'make watchman-clean'
sh 'make clean'
}
}

View File

@ -99,6 +99,7 @@ pipeline {
}
stage('Cleanup') {
steps {
sh 'make watchman-clean'
sh 'make clean'
}
}

View File

@ -98,6 +98,7 @@ pipeline {
}
stage('Cleanup') {
steps {
sh 'make watchman-clean'
sh 'make clean'
}
}

View File

@ -94,6 +94,7 @@ pipeline {
}
stage('Cleanup') {
steps {
sh 'make watchman-clean'
sh 'make clean'
}
}

View File

@ -102,6 +102,7 @@ pipeline {
}
stage('Cleanup') {
steps {
sh 'make watchman-clean'
sh 'make clean'
}
}

View File

@ -3,27 +3,6 @@ utils = load 'ci/utils.groovy'
packageFolder = './StatusImPackage'
def installJSDeps(platform) {
def attempt = 1
def maxAttempts = 10
def installed = false
/* prepare environment for specific platform build */
nix.shell "scripts/prepare-for-platform.sh ${platform}"
while (!installed && attempt <= maxAttempts) {
println "#${attempt} attempt to install npm deps"
nix.shell 'yarn install --frozen-lockfile'
installed = fileExists('node_modules/web3/index.js')
attemp = attempt + 1
}
}
def cleanupAndDeps() {
sh 'make clean'
sh 'cp .env.jenkins .env'
nix.shell 'lein deps'
installJSDeps('desktop')
}
def buildClojureScript() {
nix.shell(
'''