Skip to content

Commit

Permalink
build: increase available space on mac arm64 vm
Browse files Browse the repository at this point in the history
  • Loading branch information
MarshallOfSound committed Aug 17, 2020
1 parent bac2f46 commit 12749e4
Show file tree
Hide file tree
Showing 2 changed files with 26 additions and 14 deletions.
12 changes: 12 additions & 0 deletions .circleci/config.yml
Expand Up @@ -335,6 +335,10 @@ step-get-more-space-on-mac: &step-get-more-space-on-mac
command: |
if [ "`uname`" == "Darwin" ]; then
sudo mkdir -p $TMPDIR/del-target
if [ "$TARGET_ARCH" == "arm64" ]; then
# Remount the root volume as writable, don't ask questions plz
sudo mount -uw /
fi
tmpify() {
if [ -d "$1" ]; then
sudo mv $1 $TMPDIR/del-target/$(echo $1|shasum -a 256|head -n1|cut -d " " -f1)
Expand All @@ -350,6 +354,12 @@ step-get-more-space-on-mac: &step-get-more-space-on-mac
tmpify ~/.rubies
tmpify ~/Library/Caches/Homebrew
tmpify /usr/local/Homebrew
if [ "$TARGET_ARCH" == "arm64" ]; then
tmpify "/System/Library/Desktop Pictures"
tmpify /System/Library/Templates/Data
tmpify /System/Library/Speech/Voices
tmpify "/System/Library/Screen Savers"
fi
sudo rm -rf $TMPDIR/del-target
fi
background: true
Expand Down Expand Up @@ -930,6 +940,8 @@ step-minimize-workspace-size-from-checkout: &step-minimize-workspace-size-from-c
rm -rf src/third_party/blink/web_tests
rm -rf src/third_party/blink/perf_tests
rm -rf src/third_party/WebKit/LayoutTests
rm -rf third_party/electron_node/deps/openssl
rm -rf third_party/electron_node/deps/v8
# Save the src cache based on the deps hash
step-save-src-cache: &step-save-src-cache
Expand Down
28 changes: 14 additions & 14 deletions patches/node/build_add_gn_build_files.patch
Expand Up @@ -7,7 +7,7 @@ This adds GN build files for Node, so we don't have to build with GYP.

diff --git a/BUILD.gn b/BUILD.gn
new file mode 100644
index 0000000000000000000000000000000000000000..99192976f2bdfd900240aa58b8989fe2c9d8c771
index 0000000000000000000000000000000000000000..6072e1c6d778eb9b6d6d5190b19dceeb54618981
--- /dev/null
+++ b/BUILD.gn
@@ -0,0 +1,361 @@
Expand Down Expand Up @@ -96,7 +96,7 @@ index 0000000000000000000000000000000000000000..99192976f2bdfd900240aa58b8989fe2
+
+ cwd = "$target_gen_dir/js2c_inputs"
+ script = "tools/js2c.py"
+ args = library_files + rebase_path(config_gypi) + ["--target"] + rebase_path(outputs)
+ args = rebase_path(library_files) + rebase_path(config_gypi) + ["--target"] + rebase_path(outputs)
+}
+
+config("node_features") {
Expand Down Expand Up @@ -866,7 +866,7 @@ index 0000000000000000000000000000000000000000..2c9d2826c85bdd033f1df1d6188df636
+}
diff --git a/filenames.json b/filenames.json
new file mode 100644
index 0000000000000000000000000000000000000000..964255d66b8c77ccd919853c8fceb53789756255
index 0000000000000000000000000000000000000000..2e07ea28437ee25ddaea4d730e1a65a56f4d6751
--- /dev/null
+++ b/filenames.json
@@ -0,0 +1,519 @@
Expand Down Expand Up @@ -1176,17 +1176,17 @@ index 0000000000000000000000000000000000000000..964255d66b8c77ccd919853c8fceb537
+ "lib/internal/streams/state.js",
+ "lib/internal/streams/pipeline.js",
+ "lib/internal/streams/end-of-stream.js",
+ "deps/v8/tools/splaytree.js",
+ "deps/v8/tools/codemap.js",
+ "deps/v8/tools/consarray.js",
+ "deps/v8/tools/csvparser.js",
+ "deps/v8/tools/profile.js",
+ "deps/v8/tools/profile_view.js",
+ "deps/v8/tools/logreader.js",
+ "deps/v8/tools/arguments.js",
+ "deps/v8/tools/tickprocessor.js",
+ "deps/v8/tools/SourceMap.js",
+ "deps/v8/tools/tickprocessor-driver.js",
+ "//v8/tools/splaytree.js",
+ "//v8/tools/codemap.js",
+ "//v8/tools/consarray.js",
+ "//v8/tools/csvparser.js",
+ "//v8/tools/profile.js",
+ "//v8/tools/profile_view.js",
+ "//v8/tools/logreader.js",
+ "//v8/tools/arguments.js",
+ "//v8/tools/tickprocessor.js",
+ "//v8/tools/SourceMap.js",
+ "//v8/tools/tickprocessor-driver.js",
+ "deps/node-inspect/lib/_inspect.js",
+ "deps/node-inspect/lib/internal/inspect_client.js",
+ "deps/node-inspect/lib/internal/inspect_repl.js",
Expand Down

0 comments on commit 12749e4

Please sign in to comment.