Remove redundant clean --expunge (digital-asset#6890)

After the node resets this should hopefully not be necessary anymore (we still had an issue this morning but I believe all nodes that hit the issue also got the fix and if not, I’ll schedule a targetted clean --expunge). I’ve also added node_modules to .bazelignore to match the other node_modules directories. changelog_begin changelog_end
kgeonw · Jul 28, 2020 · 12c9612 · 12c9612
1 parent f588eac
commit 12c9612
Show file tree

Hide file tree

Showing 5 changed files with 1 addition and 13 deletions.
diff --git a/.bazelignore b/.bazelignore
@@ -1,6 +1,7 @@
 .bazel-cache
 dev-env/var
 scratch/
+node_modules/
 compiler/daml-extension/node_modules/
 language-support/ts/node_modules/
 language-support/ts/packages/node_modules/

diff --git a/build.ps1 b/build.ps1
@@ -48,9 +48,6 @@ function bazel() {
 # which later causes issues on Bazel init (source forest creation) on Windows. A shutdown closes workers,
 # which is a workaround for this problem.
 bazel shutdown
-# Temporary to workaround rules_nodejs update.
-bazel clean --expunge
-rm -Recurse -Force -ErrorAction Ignore node_modules
 
 # Prefetch nodejs_dev_env to avoid permission denied errors on external/nodejs_dev_env/nodejs_dev_env/node.exe
 # It isn’t clear where exactly those errors are coming from.

diff --git a/build.sh b/build.sh
@@ -27,10 +27,6 @@ if [ -n "$SANDBOX_PID" ]; then
     kill "$SANDBOX_PID"
 fi
 
-# Temporary to workaround rules_nodejs update.
-bazel clean --expunge
-rm -rf node_modules
-
 # Bazel test only builds targets that are dependencies of a test suite so do a full build first.
 bazel build //... --build_tag_filters "$tag_filter"
 

diff --git a/compatibility/build-release-artifacts-windows.ps1 b/compatibility/build-release-artifacts-windows.ps1
@@ -37,9 +37,6 @@ function bazel() {
 
 
 bazel shutdown
-# Temporary to workaround rules_nodejs update.
-bazel clean --expunge
-rm -Recurse -Force -ErrorAction Ignore node_modules
 bazel fetch @nodejs_dev_env//...
 bazel build `
   `-`-experimental_execution_log_file ${ARTIFACT_DIRS}/build_execution_windows.log `

diff --git a/compatibility/build-release-artifacts.sh b/compatibility/build-release-artifacts.sh
@@ -17,9 +17,6 @@ eval "$(./dev-env/bin/dade-assist)"
 # before fetching it in another step.
 HEAD_TARGET_DIR=${1:-compatibility/head_sdk}
 
-# Temporary to workaround rules_nodejs update.
-bazel clean --expunge
-rm -rf node_modules
 bazel build \
   //release:sdk-release-tarball \
   //ledger/ledger-api-test-tool:ledger-api-test-tool_deploy.jar