Merge pull request diffblue#594 from diffblue/jd/feature/yarntastrophe

JohnDumbell · web-flow · commit 771e0b0ea9d3 · 2018-08-31T14:22:16.000+01:00
Fix yarn install parallelization issue
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -90,6 +90,7 @@ install(DIRECTORY "${boost_lib_dir}" DESTINATION "${CMAKE_INSTALL_PREFIX}")
 
 set(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib")
 SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
+set(yarn_mutex_file ${CMAKE_CURRENT_SOURCE_DIR}/.yarn-mutex)
 
 add_subdirectory(cbmc)
 
diff --git a/env-model-generator/CMakeLists.txt b/env-model-generator/CMakeLists.txt
@@ -14,6 +14,6 @@ add_custom_command(
     OUTPUT ${javascript_files}
     DEPENDS ${typescript_files};package.json
     WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
-    COMMAND yarn install
+    COMMAND yarn install --mutex file:${yarn_mutex_file}
     COMMAND yarn run build
 )
diff --git a/trace-transformer/CMakeLists.txt b/trace-transformer/CMakeLists.txt
@@ -13,6 +13,6 @@ add_custom_command(
     OUTPUT ${javascript_files}
     DEPENDS ${typescript_files};package.json
     WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
-    COMMAND yarn install
+    COMMAND yarn install --mutex file:${yarn_mutex_file}
     COMMAND yarn run build
 )

Original file line number	Diff line number	Diff line change
`@@ -14,6 +14,6 @@ add_custom_command(`
`14`	`14`	`OUTPUT ${javascript_files}`
`15`	`15`	`DEPENDS ${typescript_files};package.json`
`16`	`16`	`WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}`
`17`		`- COMMAND yarn install`
	`17`	`+ COMMAND yarn install --mutex file:${yarn_mutex_file}`
`18`	`18`	`COMMAND yarn run build`
`19`	`19`	`)`
Original file line number	Diff line number	Diff line change
`@@ -13,6 +13,6 @@ add_custom_command(`
`13`	`13`	`OUTPUT ${javascript_files}`
`14`	`14`	`DEPENDS ${typescript_files};package.json`
`15`	`15`	`WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}`
`16`		`- COMMAND yarn install`
	`16`	`+ COMMAND yarn install --mutex file:${yarn_mutex_file}`
`17`	`17`	`COMMAND yarn run build`
`18`	`18`	`)`