From 9faaaffb9e34b061ad3fb22a6ca865aee25407cd Mon Sep 17 00:00:00 2001 From: Ben Gotow Date: Mon, 21 Nov 2016 14:28:49 -0800 Subject: [PATCH] fix(*): K2 inside N1, build and ship in src/K2 --- .gitmodules | 3 +++ script/bootstrap | 2 ++ src/K2 | 1 + 3 files changed, 6 insertions(+) create mode 160000 src/K2 diff --git a/.gitmodules b/.gitmodules index 78475f549..c664c33c4 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,6 @@ [submodule "build/resources/nylas"] path = src/pro url = git@github.com:nylas/edgehill.git +[submodule "src/K2"] + path = src/K2 + url = git@github.com:nylas/K2.git diff --git a/script/bootstrap b/script/bootstrap index 9865122c2..85f752670 100755 --- a/script/bootstrap +++ b/script/bootstrap @@ -70,4 +70,6 @@ npm('install', {cwd: 'build'}) .then(() => npm('dedupe', {cwd: path.join('apm', 'node_modules', 'npm'), env: 'apm'})) .then(() => npm('install', {cwd: '.', env: 'electron'})) .then(() => npm('dedupe', {cwd: '.', env: 'electron'})) +.then(() => npm('install', {cwd: 'src/K2', env: 'electron'})) +.then(() => npm('dedupe', {cwd: 'src/K2', env: 'electron'})) .then(() => installPrivateResources()) diff --git a/src/K2 b/src/K2 new file mode 160000 index 000000000..8efd4f793 --- /dev/null +++ b/src/K2 @@ -0,0 +1 @@ +Subproject commit 8efd4f79356885c446f1f59f79344241f32af212