oak-team/oak-editor
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ci: resolve CARGO_HOME via cygpath for the ocio-sys patch; gate screenshot example to macOS

Browse Source 
- rust-toolchain sets CARGO_HOME to the Windows userprofile path while
  the msys2 shell's HOME is elsewhere — the yaml-cpp patch targeted an
  empty directory and the assertion ls failed
- examples/screenshot.rs uses the macOS-only VisualTestAppContext; its
  items are now cfg-gated with a non-macOS stub main so workspace test
  builds pass on Linux/Windows
This commit is contained in:
Mike-Solar
2026-08-21 04:25:43 +08:00
parent a43302d9b7
commit 13b1799c71
3 changed files with 40 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.github/workflows/cd.yml
+7 -4
View File
@@ -294,20 +294,23 @@ jobs:
# registry src dir may not exist yet on a fresh runner — create
# it from the cache dir's hash. The trailing ls asserts the
# patched file actually exists.
# rust-toolchain sets CARGO_HOME to the WINDOWS userprofile
# path ($USERPROFILE\.cargo), not the msys2 $HOME — resolve it.
CH=$(cygpath -u "${CARGO_HOME:-$HOME/.cargo}")
cargo fetch --locked
for cache in "$HOME"/.cargo/registry/cache/*/; do
src="$HOME/.cargo/registry/src/$(basename "$cache")"
for cache in "$CH"/registry/cache/*/; do
src="$CH/registry/src/$(basename "$cache")"
mkdir -p "$src"
if [ -f "$cache/ocio-sys-0.2.1.crate" ]; then
tar xzf "$cache/ocio-sys-0.2.1.crate" -C "$src"
fi
done
for f in "$HOME"/.cargo/registry/src/*/ocio-sys-0.2.1/vendor/OpenColorIO/ext/ocio-rs-deps/yaml-cpp/src/emitterutils.cpp; do
for f in "$CH"/registry/src/*/ocio-sys-0.2.1/vendor/OpenColorIO/ext/ocio-rs-deps/yaml-cpp/src/emitterutils.cpp; do
[ -e "$f" ] || continue
grep -q '#include <cstdint>' "$f" || \
sed -i '0,/#include/s||#include <cstdint>\n&|' "$f"
done
ls "$HOME"/.cargo/registry/src/*/ocio-sys-0.2.1/vendor/OpenColorIO/ext/ocio-rs-deps/yaml-cpp/src/emitterutils.cpp
ls "$CH"/registry/src/*/ocio-sys-0.2.1/vendor/OpenColorIO/ext/ocio-rs-deps/yaml-cpp/src/emitterutils.cpp
- name: Cache cargo artifacts
uses: Swatinem/rust-cache@v2
.github/workflows/ci.yml
+7 -4
View File
@@ -130,20 +130,23 @@ jobs:
# registry src dir may not exist yet on a fresh runner — create
# it from the cache dir's hash. The trailing ls asserts the
# patched file actually exists.
# rust-toolchain sets CARGO_HOME to the WINDOWS userprofile
# path ($USERPROFILE\.cargo), not the msys2 $HOME — resolve it.
CH=$(cygpath -u "${CARGO_HOME:-$HOME/.cargo}")
cargo fetch --locked
for cache in "$HOME"/.cargo/registry/cache/*/; do
src="$HOME/.cargo/registry/src/$(basename "$cache")"
for cache in "$CH"/registry/cache/*/; do
src="$CH/registry/src/$(basename "$cache")"
mkdir -p "$src"
if [ -f "$cache/ocio-sys-0.2.1.crate" ]; then
tar xzf "$cache/ocio-sys-0.2.1.crate" -C "$src"
fi
done
for f in "$HOME"/.cargo/registry/src/*/ocio-sys-0.2.1/vendor/OpenColorIO/ext/ocio-rs-deps/yaml-cpp/src/emitterutils.cpp; do
for f in "$CH"/registry/src/*/ocio-sys-0.2.1/vendor/OpenColorIO/ext/ocio-rs-deps/yaml-cpp/src/emitterutils.cpp; do
[ -e "$f" ] || continue
grep -q '#include <cstdint>' "$f" || \
sed -i '0,/#include/s||#include <cstdint>\n&|' "$f"
done
ls "$HOME"/.cargo/registry/src/*/ocio-sys-0.2.1/vendor/OpenColorIO/ext/ocio-rs-deps/yaml-cpp/src/emitterutils.cpp
ls "$CH"/registry/src/*/ocio-sys-0.2.1/vendor/OpenColorIO/ext/ocio-rs-deps/yaml-cpp/src/emitterutils.cpp
# ------------------------------------------------------------------
# Caches