Skip to content

Improve xml handling#1671

Merged
jsuereth merged 6 commits intosbt:0.13from
ajozwik:0.13
Oct 21, 2014
Merged

Improve xml handling#1671
jsuereth merged 6 commits intosbt:0.13from
ajozwik:0.13

Conversation

@ajozwik
Copy link
Contributor

@ajozwik ajozwik commented Oct 13, 2014

Fixed #1666. Previous parser does not work for multi line statements with //

@lightbend-cla-validator

Hi @ajozwik,

Thank you for your contribution! We really value the time you've taken to put this together.

Before we proceed with reviewing this pull request, please sign the Typesafe Contributors License Agreement:

http://www.typesafe.com/contribute/cla

@typesafe-tools
Copy link

Can one of the admins verify this patch?

@ajozwik
Copy link
Contributor Author

ajozwik commented Oct 14, 2014

I signed the agreement and add the test (21.sbt.txt)

@ajozwik
Copy link
Contributor Author

ajozwik commented Oct 14, 2014

Can somebody restart the failed builds? The error log:
SERVER ERROR: Connection timed out url=https://repo1.maven.org/maven2/org/scala-lang/jline/2.10.0/jline-2.10.0.pom

@ajozwik
Copy link
Contributor Author

ajozwik commented Oct 14, 2014

One test fail - related to work-around with xml. Build was restarted after commit.

@ajozwik
Copy link
Contributor Author

ajozwik commented Oct 14, 2014

command scripted project/*2of2 has finished with success of my computer.
On travis is:

[error] x project / source-plugins
[error] {line 2} Command failed: Remote sbt initialization failed

@ajozwik
Copy link
Contributor Author

ajozwik commented Oct 14, 2014

@eed3si9n @typesafehub-validator - the build failed on travis - but the problem was with system resource - not with tests. I ran manually scripted project/*2of2 and it finished without error. Could you restart this one build 1016.9 https://travis-ci.org/sbt/sbt/jobs/37916032? I do not have privileges.

@ajozwik
Copy link
Contributor Author

ajozwik commented Oct 16, 2014

Related to #1666

@ajozwik
Copy link
Contributor Author

ajozwik commented Oct 16, 2014

@eed3si9n @typesafehub-validator @jsuereth Can somebody of you restart the build https://travis-ci.org/sbt/sbt/jobs/37916032 ?

@ajozwik
Copy link
Contributor Author

ajozwik commented Oct 18, 2014

I tried to simplify the code for xml content (and change the comments to the methods) - but I still do not have a time :) My (private) code still failed the tests - I will merge it in few days

@eed3si9n
Copy link
Member

Thanks for taking care of the bug. Is this PR ready to be merged?
We should wrap up 0.13.7 and release RC-1 soonish. How much work do you think remains to clean it up?

@ajozwik
Copy link
Contributor Author

ajozwik commented Oct 19, 2014

Please take me two days.
If you want to merge - feel free. Then I will create new PR for it.

…dExplicitXmlContent use pattern matching, splitFile - does not return whitespace statements
@ajozwik
Copy link
Contributor Author

ajozwik commented Oct 19, 2014

If test pass - ready to merge

@ajozwik
Copy link
Contributor Author

ajozwik commented Oct 20, 2014

The parallel builds on travis share the same directories. If the /tmp directory is not empty - the problem can occur. Locally I started with clean rm -Rf /tmp/sbt* and all builds passed.
To often the travis build generates wrong result.
I reproduced the error from travis by calling locally sbt "scripted compiler-project/*" "scripted project/*2of2" "scripted tests/*"

@ajozwik
Copy link
Contributor Author

ajozwik commented Oct 20, 2014

I ran (sequential):

sbt clean "scripted compiler-project/*" > compiler.log || exit 1
sbt clean "scripted project/*2of2" > 2of2.log || exit 1
sbt clean "scripted tests/*" > tests.log  || exit 1

and all tests passed (tests which failed on travis).

@eed3si9n
Copy link
Member

I restarted the failing Travis jobs. Could you open a new issue for flaky builds?

@ajozwik
Copy link
Contributor Author

ajozwik commented Oct 20, 2014

The sbt builds are not deterministic. I did not reproduce the error. Now the build hung on scripted java/* (timeout).

@jsuereth
Copy link
Member

Yeah, i'm still working on our own jenkins infrastructure where (for a lot less $$ than travis) we can get better hardware to run tests. For now, we'll deal with some flaky builds. BUT, the regression in performance/time is recent and, I think, something to investigate.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

why are we removing all these from this file? Shouldn't the methods in EvaluateConfigurations delegate down to this deprecated guy?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@gkossakowski will implement property/settings to revert old parser. So I think the old splitExpression will not be removed. Maybe it will be renamed/private. So I use original implementations.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I believe it's @eed3si9n who opened a ticket about an ability to revert to old parsing logic and planned to work on a fix.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@gkossakowski We already have that in place, AFAIK. This looks like we're removing the copy-pasted old version code. I'm ok with that, I guess, as the original implementation is deprecated, but why do we need this new object at all if we're going to decimate its methods? What the comment is about is how the original code should delgate to this one, instead of removing implementation in this object and delegate back to the original (deprecated) location.

In any case, let's merge this as-is and we can do any deprecation stuff on our end as needed.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The link to falback: #1645 (comment) - but I do not know the plan/progress.

adpi2 pushed a commit to adpi2/sbt that referenced this pull request Oct 9, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants