Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,13 @@ concurrency:
group: ${{ github.workflow }}-${{ github.ref }}
cancel-in-progress: ${{ github.event_name == 'pull_request' }}

# Pin the Docker build-volume name so CI's bind-backed "mx-build" volume
# (created per-job below) is the one the Makefile actually mounts. Without
# this the Makefile computes a CURDIR-hashed name (for worktree isolation)
# that doesn't match the pre-created volume.
env:
DOCKER_VOLUME: mx-build

jobs:
linux-gen:
name: Linux (generator gates)
Expand Down
3 changes: 2 additions & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,9 @@ DOCKER_CACHE := --cache-from type=gha --cache-to type=gha,mode=max
endif

# Docker SDK image + build volume. Incremental state persists across runs.
# Volume name includes a path hash so parallel worktrees get isolated caches.
DOCKER_IMAGE := mx-sdk
DOCKER_VOLUME := mx-build
DOCKER_VOLUME ?= mx-build-$(shell printf '%s' '$(CURDIR)' | md5sum 2>/dev/null | cut -c1-8 || printf '%s' '$(CURDIR)' | md5 -q | cut -c1-8)
DOCKER_STAMP := $(BUILD_ROOT)/.docker-image-stamp

# Prevent root-owned files on Linux.
Expand Down
6 changes: 5 additions & 1 deletion src/private/mx/impl/DirectionReader.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -416,7 +416,11 @@ void DirectionReader::parseWords(const core::DirectionType &directionType)
api::WordsData outWords;
outWords.text = wordEl.value();
outWords.positionData = getPositionData(wordEl);
outWords.colorData = getColor(wordEl);
outWords.isColorSpecified = wordEl.color().has_value();
if (outWords.isColorSpecified)
{
outWords.colorData = getColor(wordEl);
}
outWords.fontData = getFontData(wordEl);
if (wordEl.enclosure().has_value())
{
Expand Down
Loading