Update Makefile build_ui target to lerna structure (#798)

* Update Makefile build_ui target to lerna structure Signed-off-by: Joe Farro <[email protected]> * Pull in UI HEAD which has the lerna structure Signed-off-by: Joe Farro <[email protected]> * UI changes added to the changelog Signed-off-by: Joe Farro <[email protected]>
jaegertracing · Jul 18, 2018 · 0a40309 · 0a40309
1 parent 7919cd9
commit 0a40309
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 5 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -1,6 +1,6 @@
 [submodule "idl"]
 	path = idl
-	url = https://github.com/uber/jaeger-idl.git
+	url = https://github.com/jaegertracing/jaeger-idl.git
 [submodule "jaeger-ui"]
 	path = jaeger-ui
-	url = https://github.com/uber/jaeger-ui
+	url = https://github.com/jaegertracing/jaeger-ui.git
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,16 @@
 Changes by Version
 ==================
 
+TBD (pending)
+------------------
+
+#### UI Changes
+
+##### New Features
+
+- Timeline Expand and Collapse Features ([#221](https://github.com/jaegertracing/jaeger-ui/issues/221))
+- Integrate Google Analytics into Search Page ([#220](https://github.com/jaegertracing/jaeger-ui/issues/220))
+
 1.6.0 (2018-07-10)
 ------------------
 

diff --git a/Makefile b/Makefile
@@ -173,8 +173,8 @@ docker-hotrod:
 
 .PHONY: build_ui
 build_ui: install-statik
-	cd jaeger-ui && yarn install && npm run build
-	(cd cmd/query/app/ui/actual; statik -f -src ../../../../../jaeger-ui/build)
+	cd jaeger-ui && yarn install && cd packages/jaeger-ui && yarn build
+	(cd cmd/query/app/ui/actual; statik -f -src ../../../../../jaeger-ui/packages/jaeger-ui/build)
 
 .PHONY: build-all-in-one-linux
 build-all-in-one-linux: build_ui

diff --git a/jaeger-ui b/jaeger-ui