-
Notifications
You must be signed in to change notification settings - Fork 68
apm-ui: use the new kibana project layout #769
Conversation
@@ -1,9 +1,12 @@ | |||
#!/usr/bin/env bash |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Fix a lint defect
cd ./tmp | ||
git clone --depth 1 -b $BRANCH https://github.com/$OWNER/kibana.git | ||
mv ./kibana/x-pack/legacy/plugins/apm/typings/es_schemas ./apm-ui-interfaces | ||
cd ./tmp || true |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Fix a lint defect
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
What does this do? Is it if it fails navigating to ./tmp
we want to continue?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yes, have you got a different suggestion?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I'm wondering why this would fail - and fix the root cause of that.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I'll keep as it was then
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
rollback my changes, to keep it as it was
git clone --depth 1 -b $BRANCH https://github.com/$OWNER/kibana.git | ||
mv ./kibana/x-pack/legacy/plugins/apm/typings/es_schemas ./apm-ui-interfaces | ||
cd ./tmp || true | ||
git clone --quiet --depth 1 -b "${BRANCH}" "https://github.com/${OWNER}/kibana.git" |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
- reduce verbose output in the CI.
- fix a lint defect
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I originally made this git clone a little more complicated than it has to be. What I wanted was a partial checkout of just a specific path (to make it faster). I didn't find any simple ways to do that.
I don't think I saw any perf improvements by using the --depth
flag (but not 100%)
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
But you don't have to change this. Just thought I'd mention it.
mv ./kibana/x-pack/legacy/plugins/apm/typings/es_schemas ./apm-ui-interfaces | ||
cd ./tmp || true | ||
git clone --quiet --depth 1 -b "${BRANCH}" "https://github.com/${OWNER}/kibana.git" | ||
mv ./kibana/x-pack/plugins/apm/typings/es_schemas ./apm-ui-interfaces |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The real change!
Question:
- Do we need to support backward compatibility?
if so
newLocation=./kibana/x-pack/plugins/apm/typings/es_schemas
location=./kibana/x-pack/legacy/plugins/apm/typings/es_schemas
if [ -d "${newLocation}" ] ; then
location=${newLocation}
fi
mv "${location} ./apm-ui-interfaces
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Good question. If the above works I think that's a good approach. Perhaps add a comment saying that in 7.7 files moved around. Then we can move this again in a couple of minors from now.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thanks for fixing 👍
What does this PR do?
Fixes the current filesystem layout issue with the kibana project.
Reduce the verbose output in the clone
Fixes some linting issues.
Why is it important?
Fix the apm-its
Related issues
Leftovers from elastic/kibana#57532
Closes #770
Questions
*.x
branches?