Skip to content
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.

Sign up for GitHub

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

Jump to bottom

Get CI build working again #147

Merged
merged 51 commits into from
Sep 16, 2020
Merged

Get CI build working again #147

merged 51 commits into from
Sep 16, 2020

Conversation

cstroe
Copy link
Contributor

@cstroe cstroe commented Sep 12, 2020 •
edited
Loading

Fix #136

Major fixes here:

  • added template support for the test fixture project files (using FreeMarker)
  • get as many of the Play 2.3 tests working as we can, skip the rest (mostly tests that don't apply to Play 2.3)
  • split up the Travis CI build into one build per version + documentation build (avoids timeout, example) (this might also fix On CI, multi-versions tests should be executed in parallel #75)
  • be very verbose about logging test execution, failures, stacktraces

@cstroe cstroe changed the title Fix #136: Get CI build working again Get CI build working again Sep 12, 2020
This was referenced Sep 12, 2020
Closed
Closed
Closed
@ghost
Copy link

ghost commented Sep 14, 2020

Cool! Waiting for this.

JLLeitschuh
JLLeitschuh reviewed Sep 14, 2020
View reviewed changes
...ces/org/gradle/playframework/fixtures/app/playmultiproject/primary/conf/application.conf.ftl Outdated
# Logger provided to your application:
logger.application=DEBUG

</#if>
Copy link
Contributor

Choose a reason for hiding this comment

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

EOL @ EOF

Suggested change
</#if>
</#if>

JLLeitschuh
JLLeitschuh suggested changes Sep 14, 2020
View reviewed changes
Copy link
Contributor

@JLLeitschuh JLLeitschuh left a comment

Choose a reason for hiding this comment

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

This looks absolutely amazing. I'm really looking forward to merging this. Thank you so much for putting in the time to fix this.

Please take a quick pass at my minor reviews and fix them up. Once resolved, I'm absolutely looking forward to merging this.

@JLLeitschuh JLLeitschuh self-assigned this Sep 14, 2020
@cstroe
Copy link
Contributor Author

cstroe commented Sep 14, 2020

Thank you very much for the fast review! I applied your suggestions, but there was one suggestion that got left over (it might have been double suggested because it says there are no changes in the suggestion). For this I had to request a re-review.

Let me know if there's anything else required. Also, the build got triggered again, should be a good test of the CI configuration.

JLLeitschuh
JLLeitschuh suggested changes Sep 15, 2020
View reviewed changes
Copy link
Contributor

@JLLeitschuh JLLeitschuh left a comment

Choose a reason for hiding this comment

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

There are a few additional EOL @ EOF issues.

Can you make sure that every file that you've contributed has an End of Line (EO) (IE. the newline character) @ EOF (IE the last line in the file).

...dle/playframework/fixtures/app/advancedplayapp/app/special/strangename/Application.scala.ftl Outdated Show resolved Hide resolved
...estFixtures/resources/org/gradle/playframework/fixtures/app/advancedplayapp/build.gradle.ftl Outdated Show resolved Hide resolved
...TestFixtures/resources/org/gradle/playframework/fixtures/app/advancedplayapp/conf/routes.ftl Outdated Show resolved Hide resolved
...xtures/resources/org/gradle/playframework/fixtures/app/advancedplayapp/conf/scala.routes.ftl Outdated Show resolved Hide resolved
...ces/org/gradle/playframework/fixtures/app/basicplayapp/app/controllers/Application.scala.ftl Outdated Show resolved Hide resolved
...res/resources/org/gradle/playframework/fixtures/app/playappwithdependencies/build.gradle.ftl Outdated Show resolved Hide resolved
...g/gradle/playframework/fixtures/app/playcompositebuild/app/controllers/Application.scala.ftl Outdated Show resolved Hide resolved
...Fixtures/resources/org/gradle/playframework/fixtures/app/playcompositebuild/build.gradle.ftl Outdated Show resolved Hide resolved
...ures/resources/org/gradle/playframework/fixtures/app/playappwithdependencies/conf/routes.ftl Outdated Show resolved Hide resolved
...tFixtures/resources/org/gradle/playframework/fixtures/app/playcompositebuild/conf/routes.ftl Outdated Show resolved Hide resolved
@cstroe
use single threaded build for better debugging
f9ef5b5 
Signed-off-by: Cosmin Stroe <[email protected]>
@cstroe
fix ktlint error
76ae0b9 
Signed-off-by: Cosmin Stroe <[email protected]>
@cstroe
add detailed logging when running on TravisCI
924597f 
Signed-off-by: Cosmin Stroe <[email protected]>
@cstroe
fix tests by skipping version 2.3.x of Play for certain tests
5a75315 
Signed-off-by: Cosmin Stroe <[email protected]>
@cstroe
fix assertions for version 2.3
1c341e6 
Signed-off-by: Cosmin Stroe <[email protected]>
@cstroe
Play 2.7 no longer works with static methods
0ecc385 
Signed-off-by: Cosmin Stroe <[email protected]>
@cstroe
tests generate correct files for all supported Play versions
540664d 
Signed-off-by: Cosmin Stroe <[email protected]>
@cstroe
convert Application.scala into template
16f977c 
Signed-off-by: Cosmin Stroe <[email protected]>
@cstroe
convert routes to template
86c16b6 
Signed-off-by: Cosmin Stroe <[email protected]>
cstroe and others added 23 commits September 15, 2020 20:11
@cstroe
run tests in parallel again
2ea4c2b 
Signed-off-by: Cosmin Stroe <[email protected]>
@cstroe
Break up CI build into several smaller builds
8b895e6 
Signed-off-by: Cosmin Stroe <[email protected]>
@cstroe
fix some 2.3 integration tests
e7ec34a 
Signed-off-by: Cosmin Stroe <[email protected]>
@cstroe
fix another 2.3 test
d03a667 
Signed-off-by: Cosmin Stroe <[email protected]>
@cstroe
Fix another 2.3 test
f396931 
Signed-off-by: Cosmin Stroe <[email protected]>
@cstroe
Fix all 2.3 tests
ec0ceaa 
Signed-off-by: Cosmin Stroe <[email protected]>
@cstroe @JLLeitschuh
Add EOL @ EOF to src/integTestFixtures/resources/org/gradle/playframe…
949dde9 
…work/fixtures/app/playmultiproject/build.gradle.ftl

Co-authored-by: Jonathan Leitschuh <[email protected]>
Signed-off-by: Cosmin Stroe <[email protected]>
@cstroe @JLLeitschuh
Add EOL @ EOF for src/integTestFixtures/resources/org/gradle/playfram…
226add5 
…ework/fixtures/app/playmultiproject/primary/app/controllers/Application.scala.ftl

Co-authored-by: Jonathan Leitschuh <[email protected]>
Signed-off-by: Cosmin Stroe <[email protected]>
@cstroe @JLLeitschuh
Add EOL @ EOF for src/integTestFixtures/resources/org/gradle/playfram…
f0dae8a 
…ework/fixtures/app/playmultiproject/primary/build.gradle.ftl

Co-authored-by: Jonathan Leitschuh <[email protected]>
Signed-off-by: Cosmin Stroe <[email protected]>
@cstroe @JLLeitschuh
Add EOL @ EOF for src/integTestFixtures/resources/org/gradle/playfram…
7589bef 
…ework/fixtures/app/playmultiproject/primary/conf/routes.ftl

Co-authored-by: Jonathan Leitschuh <[email protected]>
Signed-off-by: Cosmin Stroe <[email protected]>
@cstroe @JLLeitschuh
Add EOL @ EOF for src/integTestFixtures/resources/org/gradle/playfram…
e1650eb 
…ework/fixtures/app/playmultiproject/submodule/app/controllers/submodule/Application.scala.ftl

Co-authored-by: Jonathan Leitschuh <[email protected]>
Signed-off-by: Cosmin Stroe <[email protected]>
@cstroe @JLLeitschuh
Add EOL @ EOF for src/integTestFixtures/resources/org/gradle/playfram…
ab1d2a9 
…ework/fixtures/app/playmultiproject/submodule/build.gradle.ftl

Co-authored-by: Jonathan Leitschuh <[email protected]>
Signed-off-by: Cosmin Stroe <[email protected]>
@cstroe @JLLeitschuh
Add EOL @ EOF for src/integTestFixtures/resources/org/gradle/playfram…
83bd68c 
…ework/fixtures/app/shared/conf/application.conf.ftl

Co-authored-by: Jonathan Leitschuh <[email protected]>
Signed-off-by: Cosmin Stroe <[email protected]>
@cstroe @JLLeitschuh
Update src/integTestFixtures/resources/org/gradle/playframework/fixtu…
9fdefb9 
…res/app/advancedplayapp/app/special/strangename/Application.scala.ftl

Co-authored-by: Jonathan Leitschuh <[email protected]>
Signed-off-by: Cosmin Stroe <[email protected]>
@cstroe @JLLeitschuh
Update src/integTestFixtures/resources/org/gradle/playframework/fixtu…
3f744fb 
…res/app/advancedplayapp/conf/routes.ftl

Co-authored-by: Jonathan Leitschuh <[email protected]>
Signed-off-by: Cosmin Stroe <[email protected]>
@cstroe @JLLeitschuh
Update src/integTestFixtures/resources/org/gradle/playframework/fixtu…
1c3dd6e 
…res/app/advancedplayapp/conf/scala.routes.ftl

Co-authored-by: Jonathan Leitschuh <[email protected]>
Signed-off-by: Cosmin Stroe <[email protected]>
@cstroe @JLLeitschuh
Update src/integTestFixtures/resources/org/gradle/playframework/fixtu…
345ffc1 
…res/app/basicplayapp/app/controllers/Application.scala.ftl

Co-authored-by: Jonathan Leitschuh <[email protected]>
Signed-off-by: Cosmin Stroe <[email protected]>
@cstroe @JLLeitschuh
Update src/integTestFixtures/resources/org/gradle/playframework/fixtu…
992bcc3 
…res/app/playappwithdependencies/build.gradle.ftl

Co-authored-by: Jonathan Leitschuh <[email protected]>
Signed-off-by: Cosmin Stroe <[email protected]>
@cstroe @JLLeitschuh
Update src/integTestFixtures/resources/org/gradle/playframework/fixtu…
cb03a6f 
…res/app/playcompositebuild/app/controllers/Application.scala.ftl

Co-authored-by: Jonathan Leitschuh <[email protected]>
Signed-off-by: Cosmin Stroe <[email protected]>
@cstroe @JLLeitschuh
Update src/integTestFixtures/resources/org/gradle/playframework/fixtu…
f3e5059 
…res/app/playcompositebuild/build.gradle.ftl

Co-authored-by: Jonathan Leitschuh <[email protected]>
Signed-off-by: Cosmin Stroe <[email protected]>
@cstroe @JLLeitschuh
Update src/integTestFixtures/resources/org/gradle/playframework/fixtu…
6ea1826 
…res/app/playappwithdependencies/conf/routes.ftl

Co-authored-by: Jonathan Leitschuh <[email protected]>
Signed-off-by: Cosmin Stroe <[email protected]>
@cstroe @JLLeitschuh
Update src/integTestFixtures/resources/org/gradle/playframework/fixtu…
d09b068 
…res/app/playcompositebuild/conf/routes.ftl

Co-authored-by: Jonathan Leitschuh <[email protected]>
Signed-off-by: Cosmin Stroe <[email protected]>
@cstroe @JLLeitschuh
Update src/integTestFixtures/resources/org/gradle/playframework/fixtu…
1d6423e 
…res/app/advancedplayapp/build.gradle.ftl

Co-authored-by: Jonathan Leitschuh <[email protected]>
Signed-off-by: Cosmin Stroe <[email protected]>
@cstroe
add EOL @ EOF
a7f1175 
Signed-off-by: Cosmin Stroe <[email protected]>
@cstroe
Copy link
Contributor Author

cstroe commented Sep 16, 2020 •
edited
Loading

Sorry about that, I think what happened is when I ran the commands for the DCO signing after accepting the changes on GitHub, I didn't pull locally, so overwrote all the newline additions changes.

I double checked the newline additions, they should be there now.

JLLeitschuh
JLLeitschuh approved these changes Sep 16, 2020
View reviewed changes
Copy link
Contributor

@JLLeitschuh JLLeitschuh left a comment

Choose a reason for hiding this comment

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

Looks good to me!!

@JLLeitschuh JLLeitschuh merged commit b0b48a5 into gradle:master Sep 16, 2020
@cstroe cstroe deleted the fix-ci-build branch September 16, 2020 20:25
@marracuene marracuene mentioned this pull request Oct 5, 2020
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@JLLeitschuh JLLeitschuh JLLeitschuh approved these changes

Assignees

@JLLeitschuh JLLeitschuh

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Fix CI on master On CI, multi-versions tests should be executed in parallel
2 participants
@cstroe @JLLeitschuh