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.

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

241: Gradle version plugin should allow a version.txt file #375

Closed
wants to merge 1 commit into from

Conversation

edvbld
Copy link
Member

@edvbld edvbld commented Jan 23, 2020

Hi all,

please review this small patch that makes the VersionPlugin look for a
version.txt in the root directory of the repository if the .git directory
is missing. This is useful to be able to build Skara with a proper version from
e.g. a source tarball.

Thanks,
Erik

Testing

  • Manual testing in directory without .git present
  • Manual testing in directory with .git present

Progress

  • Change must not contain extraneous whitespace
  • Change must be properly reviewed

Issue

SKARA-241: Gradle version plugin should allow a version.txt file

Approvers

@bridgekeeper
Copy link

@bridgekeeper bridgekeeper bot commented Jan 23, 2020

👋 Welcome back ehelin! A progress list of the required criteria for merging this PR into master will be added to the body of your pull request (refresh this page to view it).

Copy link
Member

@rwestberg rwestberg left a comment

Looks good!

@openjdk openjdk bot removed the rfr label Jan 23, 2020
@openjdk
Copy link

@openjdk openjdk bot commented Jan 23, 2020

@edvbld This change now passes all automated pre-integration checks. When the change also fulfills all project specific requirements, type /integrate in a new comment to proceed. After integration, the commit message will be:

241: Gradle version plugin should allow a version.txt file

Reviewed-by: rwestberg
  • If you would like to add a summary, use the /summary command.
  • To credit additional contributors, use the /contributor command.
  • To add additional solved issues, use the /solves command.

Since the source branch of this PR was last updated there have been 2 commits pushed to the master branch. Since there are no conflicts, your changes will automatically be rebased on top of these commits when integrating. If you prefer to do this manually, please merge master into your branch first.

➡️ To integrate this PR with the above commit message, type /integrate in a new comment.

@openjdk openjdk bot added the ready label Jan 23, 2020
@mlbridge
Copy link

@mlbridge mlbridge bot commented Jan 23, 2020

Webrevs

@edvbld
Copy link
Member Author

@edvbld edvbld commented Jan 23, 2020

/integrate

@openjdk openjdk bot closed this Jan 23, 2020
@openjdk openjdk bot added integrated and removed ready labels Jan 23, 2020
@openjdk
Copy link

@openjdk openjdk bot commented Jan 23, 2020

@edvbld The following commits have been pushed to master since your change was applied:

  • 5efaf03: 239: Add link to pull requests to automatically generated webrevs
  • db6fbee: 238: Add link to upstream repository to generated webrevs

Your commit was automatically rebased without conflicts.

Pushed as commit 73dda3f.

@mlbridge
Copy link

@mlbridge mlbridge bot commented Jan 23, 2020

Mailing list message from Erik Helin on skara-dev:

Changeset: 73dda3f
Author: Erik Helin <ehelin at openjdk.org>
Date: 2020-01-23 08:06:43 +0000
URL: https://git.openjdk.java.net/skara/commit/73dda3f0

241: Gradle version plugin should allow a version.txt file

Reviewed-by: rwestberg

! buildSrc/version/src/main/java/org/openjdk/skara/gradle/version/VersionPlugin.java

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
2 participants