cd: bundle all runtime dylibs on Windows/macOS; version from workspace

Windows: tooling/package/bundle-dylibs-windows.sh collects the MSYS2
runtime DLLs (libstdc++, libgcc, OpenColorIO, ...) with ntldd -R,
iterated to a fixpoint over freshly copied DLLs; a packager resources
glob places them next to the executables in the NSIS installer.

macOS: tooling/package/bundle-dylibs-macos.sh copies every non-system
dylib otool reports into Contents/Frameworks, rewrites the install
names to @executable_path/../Frameworks to a fixpoint, and ad-hoc
re-signs every modified Mach-O (rewriting invalidates the seal).

The CD package version no longer comes from the git tag: the root
Cargo.toml gains [workspace.package] version = "0.5.0", the oak
package inherits it (version.workspace = true — which cargo-packager
also picks up), and the Linux container packaging parses that field.
This commit is contained in:
2026-08-21 12:53:24 +08:00
parent 498669509a
commit d9dc16ec26
4 changed files with 182 additions and 6 deletions
+20 -4
View File
@@ -120,10 +120,9 @@ jobs:
- name: Package
run: |
set -euo pipefail
VERSION="${GITHUB_REF_NAME#v}"
if [ "$VERSION" = "$GITHUB_REF_NAME" ]; then
VERSION="$(cargo pkgid | sed 's/.*#//' | cut -d@ -f2-)+git"
fi
# The release version lives in [workspace.package] of the root
# Cargo.toml (single source of truth; tags do not carry it).
VERSION=$(sed -n '/^\[workspace\.package\]/,/^\[/s/^version = "\(.*\)"/\1/p' Cargo.toml | head -1)
case "${{ matrix.distro }}" in
debian) tooling/package/build-deb.sh "$VERSION" ;;
fedora) tooling/package/build-rpm.sh "$VERSION" ;;
@@ -274,6 +273,12 @@ jobs:
- name: Package .app bundle
run: cargo packager --release --formats app
# Pull the Homebrew dylibs the binaries reference into
# Contents/Frameworks and rewrite install names to
# @executable_path-relative (the script ad-hoc re-signs the bundle).
- name: Bundle dylibs into the .app
run: tooling/package/bundle-dylibs-macos.sh target/release/Oak.app
- name: Create DMG
run: |
rm -rf dmg-staging
@@ -390,6 +395,17 @@ jobs:
unset INCLUDE LIB
cargo build --release --locked
# Collect the MSYS2 runtime DLLs (libstdc++/libgcc/OpenColorIO/...)
# into target/pkg/win-dlls; the packager `resources` glob then
# installs them next to the executables.
- name: Bundle runtime DLLs
run: |
unset INCLUDE LIB
pacman -S --needed --noconfirm mingw-w64-ucrt-x86_64-ntldd
tooling/package/bundle-dylibs-windows.sh target/pkg/win-dlls \
target/release/oak-editor.exe target/release/oak-cli.exe \
target/release/oak-worker.exe
- name: Package (NSIS)
run: cargo packager --release --formats nsis