-
Notifications
You must be signed in to change notification settings - Fork 275
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
Enabled automated, sequenced releases from Travis CI #1387
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.
Thanks for implementing this, @mockitoguy! I just have a few small comments.
To clarify, the shipkit-auto-version plugin avoids tag conflicts by using the # of commits since the last tag to get the new version number?
@cgtz, thank you for feedback! Resolving the comments now... |
Yes. It tries to count the merge commits in case the PR has many commits, to allow smaller increments. But generally, the core of the algorithm is counting commits. |
@cgtz, updated per your feedback! Can you consider merging? Please expose GIT_SECRET env variable in Travis UI (see more in PR description). Thanks! |
travis-build.sh
Outdated
set -e | ||
|
||
echo "Building and testing artifacts, and creating pom files" | ||
./gradlew -s -i --scan build publishToMavenLocal codeCoverageReport |
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.
Could you remove the -i
option from this command? Since we have logging enabled for our tests, this can produce a ton of output.
I think it should be okay to use -i
on lines 10 and 17 though.
Our tests have noisy logging, and travis can't show all of the output.
Codecov Report
@@ Coverage Diff @@
## master #1387 +/- ##
============================================
+ Coverage 72.66% 72.66% +<.01%
- Complexity 6890 7007 +117
============================================
Files 498 507 +9
Lines 38925 39531 +606
Branches 4937 4999 +62
============================================
+ Hits 28283 28724 +441
- Misses 9294 9437 +143
- Partials 1348 1370 +22
Continue to review full report at Codecov.
|
To support internal adapted gradle builds, we used to have a flag that disables the release/publishing related gradle plugins, "disableShipkit". This commit adds it back, as it got removed in PR linkedin#1387.
To support internal adapted gradle builds, we used to have a flag that disables the release/publishing related gradle plugins, "disableShipkit". This commit adds it back, as it got removed in PR #1387. Also add back testJar publishing.
The goal is to release automatically from Travis and enable convenient merging of PRs, even if many PRs are merged concurrently (bug in Shipkit Gradle plugin: mockito/shipkit#395).
Important Add 'GIT_SECRET' env variable in Travis UI in format: user:github_access_token, for example: mockitoguy:qq43234xc23x23d24d
More details:
This PR removes following features (acceptable trade-offs, we can implement it in the future):