-
Notifications
You must be signed in to change notification settings - Fork 17
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Update the build command for OLC #122
base: master
Are you sure you want to change the base?
Conversation
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 like that; OLC should be responsible for its own installatio
setup.sh
Outdated
@@ -317,7 +317,7 @@ install_hooks() { | |||
|
|||
install_our_lovely_cli() { | |||
cd "$DEVTOOLS_DIR/our-lovely-cli" | |||
npm install | |||
make |
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.
On second thought, we should have an explicit make target here, rather than just depending on the first one being the one to install. I'm not even sure what it should be, looking at the (confusing) Makefile. make yarn
? make all
? You may want to ask in #github-prs
.
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.
@csilvers we're having problems with our Makefile
, and it's been on my list to reach out to you to chat w you (when you have time), as everyone says you're the "make expert" here. I wonder if we should solve that first, since the solution could be to just get rid of the Makefile
altogether...
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.
@lillialexis am happy to chat with you! My calendar is accurate if you want to find time tomorrow.
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.
@marekweb please use make all
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.
oh, wait, maybe make all
doesn't do yarn build
, but I'll fix that in OLC momentarily...
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.
Alright, I updated it to make all
assuming that will be the final command.
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.
Yay, thank you!
cd "$DEVTOOLS_DIR/our-lovely-cli" | ||
npm install | ||
make all |
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.
Now that you're using make
, a better alternative is to just do:
make -C "$DEVTOOLS_DIR/our-lovely-cli" all
Then we don't have to do the cd
, which is always nice to avoid in shell scripts.
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.
Ok, hold up, because now John is pushing back on the make all
in the OLC Makefile
... so sorry that this has been such a headache to coordinate! https://github.com/Khan/our-lovely-cli/pull/743
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.
Ok, I just merged my new command in with make all
Summary
The build command in
install_our_lovely_cli()
is not quite right because:yarn
so doingnpm install
causes a warning about apackage-lock.json
created by a different package manager when doing subsequent runs ofyarn
This change updates it to run
make all
.Test plan