Build: Fix gradle build for Mac OS #35968
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Remove trailing line feed from the output of the command to get the number of CPUs. Follow up to: elastic#35789
|
Pinging @elastic/es-core-infra |
rjernst
reviewed
Nov 27, 2018
| @@ -910,7 +910,7 @@ class BuildPlugin implements Plugin<Project> { | |||
| args '-n', 'hw.physicalcpu' | |||
| standardOutput = stdout | |||
| } | |||
| return stdout.toString('UTF-8') | |||
| return stdout.toString('UTF-8').replace(System.lineSeparator(), ""); | |||
There was a problem hiding this comment.
I think you could just use .trim()?
rjernst
approved these changes
Nov 27, 2018
nik9000
approved these changes
Nov 27, 2018
|
@nik9000 no worries! |
matriv
added a commit
that referenced
this pull request
Nov 27, 2018
Remove trailing line feed from the output of the command to get the number of CPUs. Follow up to: #35789
|
Backported to |
jasontedor
added a commit
to jasontedor/elasticsearch
that referenced
this pull request
Nov 28, 2018
* master: DOCS Audit event attributes in new format (elastic#35510) Scripting: Actually add joda time back to whitelist (elastic#35965) [DOCS] fix HLRC ILM doc misreferenced tag Add realm information for Authenticate API (elastic#35648) [ILM] add HLRC docs to remove-policy-from-index (elastic#35759) [Rollup] Update serialization version after backport [Rollup] Add more diagnostic stats to job (elastic#35471) Build: Fix gradle build for Mac OS (elastic#35968) Adds deprecation logging to ScriptDocValues#getValues. (elastic#34279) [Monitoring] Make Exporters Async (elastic#35765) [ILM] reduce time restriction on IndexLifecycleExplainResponse (elastic#35954) Remove use of AbstractComponent in xpack (elastic#35394) Deprecate types in search and multi search templates. (elastic#35669) Remove fromXContent from IndexUpgradeInfoResponse (elastic#35934)
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Remove trailing line feed from the output of the command to get
the number of CPUs.
Follow up to: #35789