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

Improve release default value #325

Merged
merged 5 commits into from Mar 16, 2020
Merged

Conversation

Jean85
Copy link
Collaborator

@Jean85 Jean85 commented Mar 16, 2020

Fixes #323, improves upon #292.
Since PrettyVersion is already a requirement of this bundle, we can use it directly to obtain a prettier release tag from the project.

Note: this will still not work if the .git folder is missing.

@Jean85 Jean85 added this to the 3.4 milestone Mar 16, 2020
@Jean85 Jean85 self-assigned this Mar 16, 2020
@Jean85 Jean85 merged commit d48d50d into master Mar 16, 2020
@Jean85 Jean85 deleted the change-release-default-provisioning branch March 16, 2020 09:07
@@ -111,7 +112,7 @@ public function getConfigTreeBuilder(): TreeBuilder
->prototype('scalar');
$optionsChildNodes->scalarNode('project_root');
$optionsChildNodes->scalarNode('release')
->defaultValue(Versions::getVersion(Versions::ROOT_PACKAGE_NAME))
->defaultValue(PrettyVersions::getVersion(Versions::ROOT_PACKAGE_NAME)->getPrettyVersion())
Copy link
Contributor

Choose a reason for hiding this comment

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

Is this still going to lead to trackable hashes in sentry? The previous version kinda did

Copy link
Collaborator Author

@Jean85 Jean85 Mar 16, 2020

Choose a reason for hiding this comment

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

This is the behavior, from the readme:

if the requested package is a tagged version, it will return just the short version; if not, [...] it will return the version of the package, followed by the short version of the commit hash (i.e. 6.0.0@fa5711)

[EDIT] The short version is just the tag.

So, it should.

Copy link
Contributor

Choose a reason for hiding this comment

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

@Jean85 most software is released via rolling master or such directly, so it will likely be dev-master@abcdef

If sentry can work with that, we should be OK, just wanted to make sure of that.

@@ -21,7 +21,6 @@
"require": {
"php": "^7.1",
"jean85/pretty-package-versions": "^1.0",
"ocramius/package-versions": "^1.3.0",
Copy link
Contributor

Choose a reason for hiding this comment

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

This removal seems wrong, as the code is still depending directly on \PackageVersions\Versions::ROOT_PACKAGE_NAME in src/DependencyInjection/Configuration.php

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

That's right, a composer-checker run would have spotted that. BTW this will not break the app since that is an implicit dependency of jean85/pretty-package-versions.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Handle default release version w/o git SHA gracefully
5 participants