Allow .mill-jvm-opts to interpolate environment variables, add .mill-opts
#3841
Conversation
| |mill_jvm_opts="" | ||
| |init_mill_jvm_opts () { | ||
| | if [ -z $$MILL_JVM_OPTS_PATH ] ; then | ||
| | mill_jvm_opts_file=".mill-jvm-opts" | ||
| | else | ||
| | mill_jvm_opts_file=$$MILL_JVM_OPTS_PATH | ||
| | fi | ||
| | | ||
| | if [ -f "$$mill_jvm_opts_file" ] ; then | ||
| | # We need to append a newline at the end to fix | ||
| | # https://github.com/com-lihaoyi/mill/issues/2140 | ||
| | newline=" | ||
| |" | ||
| | mill_jvm_opts="$$( | ||
| | echo "$$newline" | cat "$$mill_jvm_opts_file" - | ( | ||
| | while IFS= read line | ||
| | do | ||
| | mill_jvm_opts="$${mill_jvm_opts} $$(echo $$line | grep -v "^[[:space:]]*[#]")" | ||
| | done | ||
| | # we are in a sub-shell, so need to return it explicitly | ||
| | echo "$${mill_jvm_opts}" | ||
| | ) | ||
| | )" | ||
| | mill_jvm_opts="$${mill_jvm_opts} -Dmill.jvm_opts_applied=true" | ||
| | fi | ||
| |} | ||
| | |
There was a problem hiding this comment.
@lefou do you remember what this stuff is? AFAIK, we currently do all MILL_JVM_OPTS processing in the mill client Java code, so not sure why we have to do some bash logic here
There was a problem hiding this comment.
Also the relevant integration tests seem to pass with this stuff deleted
There was a problem hiding this comment.
I think it might be remnant from back when mill -i ran everything within a single process, so we needed to make sure it was initialized correctly before that process started. Should be unnecessary now
There was a problem hiding this comment.
Exactly. This was prior to processing this in Java. This is a left over and should be no longer needed since we no longer run any task evaluation in the client JVM.
| |mill_jvm_opts="" | ||
| |init_mill_jvm_opts () { | ||
| | if [ -z $$MILL_JVM_OPTS_PATH ] ; then | ||
| | mill_jvm_opts_file=".mill-jvm-opts" | ||
| | else | ||
| | mill_jvm_opts_file=$$MILL_JVM_OPTS_PATH | ||
| | fi | ||
| | | ||
| | if [ -f "$$mill_jvm_opts_file" ] ; then | ||
| | # We need to append a newline at the end to fix | ||
| | # https://github.com/com-lihaoyi/mill/issues/2140 | ||
| | newline=" | ||
| |" | ||
| | mill_jvm_opts="$$( | ||
| | echo "$$newline" | cat "$$mill_jvm_opts_file" - | ( | ||
| | while IFS= read line | ||
| | do | ||
| | mill_jvm_opts="$${mill_jvm_opts} $$(echo $$line | grep -v "^[[:space:]]*[#]")" | ||
| | done | ||
| | # we are in a sub-shell, so need to return it explicitly | ||
| | echo "$${mill_jvm_opts}" | ||
| | ) | ||
| | )" | ||
| | mill_jvm_opts="$${mill_jvm_opts} -Dmill.jvm_opts_applied=true" | ||
| | fi | ||
| |} | ||
| | |
There was a problem hiding this comment.
Exactly. This was prior to processing this in Java. This is a left over and should be no longer needed since we no longer run any task evaluation in the client JVM.
How does this behave when we find an opion like |
This PR extends
.mill-jvm-optsto support interpolating JVM variables. This provides a bit of flexibility in allowing$PWDand$USERto be used when passing-Dproperty=to Mill. This could in theory be fleshed out even further to run arbitrary shell snippets, but for now I this should provide enough flexibility to meet the immediate needs.Also added a
.mill-opts, which is similar to.mill-jvm-optsbut used for Mill arguments rather than JVM arguments. This provides a way to persistent required Mill configuration in a format that is similar to what we already have today (CLI args). This would be a common place to put things like--jobs=0.5Cor--allow-positionalor--no-build-lock.Updated the integration tests and documentation
related discussions