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

Fix version causing build signature issues #445

Merged
merged 2 commits into from
Sep 14, 2018
Merged

Conversation

johnsca
Copy link
Contributor

@johnsca johnsca commented Sep 14, 2018

The version file was getting added to the manifest even if it wasn't created, causing a modification error stating that it was removed after the last build.

It was also failing if the charm was a git repo that didn't have annotated tags instead of just using the sha.

The version file was getting added to the manifest even if it wasn't
created, causing a modification error stating that it was removed after
the last build.

It was also failing if the charm was a git repo that didn't have
annotated tags instead of just using the sha.
@@ -973,7 +974,7 @@ def trigger(cls, entity, target, layer, next_config):

def _try_to_get_current_sha(self):
cmds = (
('git', 'describe', '--dirty'),
('git', 'describe', '--dirty', '--always'),
Copy link
Contributor Author

Choose a reason for hiding this comment

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

For reference:

[johnsca@murdoch:~ … layers/vault/src] $ git describe --dirty
fatal: No names found, cannot describe anything.
[johnsca@murdoch:~ … layers/vault/src] $ git describe --dirty --always
f5ba548-dirty

Copy link
Contributor

@tvansteenburgh tvansteenburgh left a comment

Choose a reason for hiding this comment

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

lgtm

@johnsca johnsca merged commit f9a990d into master Sep 14, 2018
@johnsca johnsca deleted the bug/version-manifest branch September 18, 2019 07:29
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.

None yet

2 participants