Merge upstream paullouisageneau/violet (v1.6.1 libjuice, up to 0.5.4)#9
Open
PierreFouquet wants to merge 40 commits into
Open
Merge upstream paullouisageneau/violet (v1.6.1 libjuice, up to 0.5.4)#9PierreFouquet wants to merge 40 commits into
PierreFouquet wants to merge 40 commits into
Conversation
Add Dockerfile
…ibjuice Add CMake option to use libjuice from the system
…x-c-standard CMake: Fix C standard
…ockerfile Update Dockerfile
…elease Set docker build to release mode
…d-findlibjuice CMake: Add FindLibJuice module
Fix typo in help screen
# Conflicts: # Dockerfile
Author
|
Deployment follow-up: babblevoice/babble-configs#111 bumps the |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Merges the latest from upstream
paullouisageneau/violetinto our fork.What this brings in
eff89f7→b509b6c), plus several intermediate libjuice updates.FindLibJuicemodule, deprecation warning) and version bumps.Our version was already at
0.5.4, matching upstream — no version change.Conflict resolution
The only conflict was
Dockerfile. Ours and upstream had made identical changes (uppercaseAS,-DCMAKE_BUILD_TYPE=Release,ENTRYPOINToverCMD); the sole real difference was the base image.alpine:3.23over upstream'salpine:3.20.Net diff vs current master
All fork-specific work (build workflows, Alpine bump) is preserved.
🤖 Generated with Claude Code