Skip to content

Commit 0a40309

Browse files
Joe Farroyurishkuro
Joe Farro
authored andcommitted
Update Makefile build_ui target to lerna structure (#798)
* Update Makefile build_ui target to lerna structure Signed-off-by: Joe Farro <joef@uber.com> * Pull in UI HEAD which has the lerna structure Signed-off-by: Joe Farro <joef@uber.com> * UI changes added to the changelog Signed-off-by: Joe Farro <joef@uber.com>
1 parent 7919cd9 commit 0a40309

File tree

4 files changed

+15
-5
lines changed

4 files changed

+15
-5
lines changed

.gitmodules

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[submodule "idl"]
22
path = idl
3-
url = https://github.com/uber/jaeger-idl.git
3+
url = https://github.com/jaegertracing/jaeger-idl.git
44
[submodule "jaeger-ui"]
55
path = jaeger-ui
6-
url = https://github.com/uber/jaeger-ui
6+
url = https://github.com/jaegertracing/jaeger-ui.git

CHANGELOG.md

+10
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,16 @@
11
Changes by Version
22
==================
33

4+
TBD (pending)
5+
------------------
6+
7+
#### UI Changes
8+
9+
##### New Features
10+
11+
- Timeline Expand and Collapse Features ([#221](https://github.com/jaegertracing/jaeger-ui/issues/221))
12+
- Integrate Google Analytics into Search Page ([#220](https://github.com/jaegertracing/jaeger-ui/issues/220))
13+
414
1.6.0 (2018-07-10)
515
------------------
616

Makefile

+2-2
Original file line numberDiff line numberDiff line change
@@ -173,8 +173,8 @@ docker-hotrod:
173173

174174
.PHONY: build_ui
175175
build_ui: install-statik
176-
cd jaeger-ui && yarn install && npm run build
177-
(cd cmd/query/app/ui/actual; statik -f -src ../../../../../jaeger-ui/build)
176+
cd jaeger-ui && yarn install && cd packages/jaeger-ui && yarn build
177+
(cd cmd/query/app/ui/actual; statik -f -src ../../../../../jaeger-ui/packages/jaeger-ui/build)
178178

179179
.PHONY: build-all-in-one-linux
180180
build-all-in-one-linux: build_ui

jaeger-ui

Submodule jaeger-ui updated 292 files

0 commit comments

Comments
 (0)