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

Update Dockerfile and CMake files to build develop/master #149

Merged
merged 1 commit into from
Oct 28, 2024
Merged

Update Dockerfile and CMake files to build develop/master #149

merged 1 commit into from
Oct 28, 2024

Conversation

vtnerd
Copy link
Owner

@vtnerd vtnerd commented Oct 27, 2024

The Dockerfile will build against the develop branch once this upstream PR is merged.

@vtnerd vtnerd force-pushed the update/dockerfile_squashed branch from c728f5b to 2a4f672 Compare October 28, 2024 00:31
@vtnerd
Copy link
Owner Author

vtnerd commented Oct 28, 2024

There is a difference between upstream monero branches and how libsodium gets pulled in. So this code now reacts to either, so that the Docker build should work as well as master builds.

@vtnerd vtnerd merged commit cd80138 into develop Oct 28, 2024
14 checks passed
@vtnerd vtnerd deleted the update/dockerfile_squashed branch October 28, 2024 17:47
vtnerd added a commit that referenced this pull request Oct 28, 2024
@vtnerd
Update Dockerfile and CMake files to build develop/master (#149)
a5d802c
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
1 participant
@vtnerd