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

Support unique plugin versions for Nix and Docker #1799

Merged
merged 6 commits into from
Jul 27, 2021
Merged

Support unique plugin versions for Nix and Docker #1799

merged 6 commits into from
Jul 27, 2021

Conversation

dominiklohmann
Copy link
Member

@dominiklohmann dominiklohmann commented Jul 23, 2021 •
edited by tobim
Loading

📔 Description

This PR adds the necessary scaffolding to support the new plugin versioning from #1764 for Nix and Docker.

📝 Checklist

  • All user-facing changes have changelog entries.
  • The changes are reflected on docs.tenzir.com/vast, if necessary.
  • The PR description contains instructions for the reviewer, if necessary.

🎯 Review Instructions

To be taken over by @tobim for the Nix fixups and the changelog entry, then to be reviewed commit-by-commit.

@dominiklohmann
Support fallbacks for unique plugin versions
c05a161 
When Git is unavailable, passing
`-DVAST_PLUGIN_<plugin>_REVISION=<revision>` allows for having unique
plugin versions. This is required for the Nix and Docker builds.
@dominiklohmann
Set plugin versions for Docker images
f927a9d
@dominiklohmann dominiklohmann added the bug Incorrect behavior label Jul 23, 2021
@dominiklohmann dominiklohmann requested review from tobim and a team July 23, 2021 13:02
tobim
tobim approved these changes Jul 26, 2021
View reviewed changes
Copy link
Member

@tobim tobim left a comment

Choose a reason for hiding this comment

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

The changes to the docker file and CMake look fine to me.

@tobim tobim marked this pull request as ready for review July 26, 2021 12:52
lava
lava requested changes Jul 26, 2021
View reviewed changes
Copy link
Member

@lava lava left a comment •
edited
Loading

Choose a reason for hiding this comment

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

[This review is only for the last commit]

There still seems to be a bug in the git rev-list invocation, or I misunderstood the usage.

dominiklohmann
dominiklohmann commented Jul 27, 2021
View reviewed changes
Copy link
Member Author

@dominiklohmann dominiklohmann left a comment

Choose a reason for hiding this comment

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

Note that while this works, one of the remaining deficiencies is that plugin directory name does not necessarily equal plugin target name.

lava
lava approved these changes Jul 27, 2021
View reviewed changes
Copy link
Member

@lava lava left a comment

Choose a reason for hiding this comment

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

I tried this locally and it works now as expected.

@tobim tobim merged commit 5ffc53d into master Jul 27, 2021
@tobim tobim deleted the story/ch27147/unique-plugin-version-docker-nix branch July 27, 2021 07:22
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@lava lava lava approved these changes

@tobim tobim tobim approved these changes

Assignees
No one assigned
Labels
bug Incorrect behavior
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@dominiklohmann @lava @tobim