Mike-Solar
c5f1d0d76c
- oakengine is now cdylib-only (no rlib/staticlib consumers anywhere; cargo tree verified) — the plugin/external C ABI layer; README and docs updated - cd.yml drops the dylib embedding/re-sign steps (the app no longer links it) - test race root-caused and fixed for good: the global undo stack lock is now a re-entrant mutex (parking_lot) shared by every test that drives the stack, including the previously unlocked node/render families; the render-manager serial-ordering bug (an earlier repro test initialized the global manager before the not-initialized test) is fixed with a shared SERIAL guard and a manager shutdown - 5 consecutive parallel runs clean; serial 209/209
317 lines
11 KiB
YAML
317 lines
11 KiB
YAML
name: CD
|
|
|
|
on:
|
|
push:
|
|
tags:
|
|
- 'v*'
|
|
workflow_dispatch:
|
|
|
|
permissions:
|
|
contents: write
|
|
|
|
jobs:
|
|
# ------------------------------------------------------------------
|
|
# Linux: deb + AppImage + pacman in one job. cargo-packager does not
|
|
# support rpm (its format list is deb/appimage/pacman/nsis/dmg/app/wix),
|
|
# and its "pacman" format emits a PKGBUILD + source tarball rather than a
|
|
# compiled pkg.tar.zst — both are upstream limitations.
|
|
# ------------------------------------------------------------------
|
|
linux:
|
|
name: Linux packages (deb, AppImage, pacman)
|
|
runs-on: warp-ubuntu-latest-x64-8x
|
|
|
|
steps:
|
|
- name: Checkout
|
|
uses: actions/checkout@v4
|
|
with:
|
|
submodules: true
|
|
|
|
- name: Install Rust (stable)
|
|
uses: dtolnay/rust-toolchain@stable
|
|
|
|
- name: Install system dependencies
|
|
run: |
|
|
tooling/install-deps.sh
|
|
# Real OpenColorIO (ocio-sys real bridge) + rsvg-convert for the
|
|
# app icon (cargo-packager needs PNG/icns/ico, the repo only has
|
|
# Oak_Icon.svg).
|
|
sudo apt-get install -y \
|
|
libopencolorio-dev \
|
|
librsvg2-bin \
|
|
libgl1-mesa-dev libgl1-mesa-dri mesa-vulkan-drivers \
|
|
libvulkan-dev libxkbcommon-dev
|
|
|
|
- name: Configure build environment
|
|
run: |
|
|
{
|
|
echo "OCIO_RS_ENABLE_REAL=1"
|
|
echo "OCIO_INSTALL_DIR=/usr"
|
|
echo "OCIO_RS_LINK=dynamic"
|
|
} >> "$GITHUB_ENV"
|
|
|
|
- name: Cache cargo artifacts
|
|
uses: Swatinem/rust-cache@v2
|
|
with:
|
|
shared-key: oak-workspace
|
|
|
|
- name: Cache project FFmpeg
|
|
uses: actions/cache@v4
|
|
with:
|
|
path: .cache/ffmpeg
|
|
key: ffmpeg-${{ runner.os }}-${{ hashFiles('tooling/ffmpeg/build-ffmpeg.sh') }}
|
|
|
|
- name: Build project FFmpeg (static, GPL + free codecs + hwaccel)
|
|
run: |
|
|
tooling/ffmpeg/build-ffmpeg.sh
|
|
echo "FFMPEG_DIR=$PWD/.cache/ffmpeg" >> "$GITHUB_ENV"
|
|
|
|
- name: Install cargo-packager
|
|
run: cargo install cargo-packager --locked
|
|
|
|
- name: Generate app icon (PNG from Oak_Icon.svg)
|
|
run: |
|
|
mkdir -p icons
|
|
# cargo-packager's tauri-icns 0.1.0 maps only 512x512@1x (and
|
|
# 1024x1024@2x); a plain 1024x1024 PNG aborts with "No matching
|
|
# IconType", so render 512x512.
|
|
rsvg-convert -w 512 -h 512 Oak_Icon.svg -o icons/icon.png
|
|
file icons/icon.png
|
|
|
|
# Build the packaged binaries (default members: the app, oak-cli,
|
|
# oak-worker). oakengine is a workspace member but NOT a default
|
|
# member (M14 R4: pure cdylib for plugins/external consumers — no
|
|
# packaged binary links it), so it is not built here.
|
|
- name: Build (release)
|
|
run: cargo build --release --locked
|
|
|
|
- name: Package (deb, AppImage, pacman)
|
|
run: cargo packager --release --formats deb,appimage,pacman
|
|
|
|
# cargo-packager has no rpm format; convert the deb with fpm. The gem
|
|
# bin dir may not be on PATH for the system ruby, so call fpm by path.
|
|
- name: Package (rpm, via fpm)
|
|
run: |
|
|
sudo apt-get install -y ruby ruby-dev rpm
|
|
sudo gem install --no-document fpm
|
|
sudo "$(sudo gem env gemdir)/bin/fpm" -s deb -t rpm --name oak-editor \
|
|
--version "$(cargo pkgid | sed 's/.*#//' | cut -d@ -f2-)" \
|
|
target/release/*.deb
|
|
mv ./*.rpm target/release/
|
|
|
|
- name: Upload artifacts
|
|
uses: actions/upload-artifact@v4
|
|
with:
|
|
name: oak-linux
|
|
path: |
|
|
target/release/*.deb
|
|
target/release/*.rpm
|
|
target/release/*.AppImage
|
|
target/release/*.tar.gz
|
|
target/release/PKGBUILD
|
|
if-no-files-found: error
|
|
|
|
# # ------------------------------------------------------------------
|
|
# macOS: Apple Silicon only. The app/CLI/worker no longer link
|
|
# liboakengine (M14 R4: they call the module rlibs directly), so the
|
|
# .app bundle carries no dylib to fold in; package it with
|
|
# cargo-packager and create the DMG with hdiutil.
|
|
# ------------------------------------------------------------------
|
|
macos:
|
|
name: macOS DMG (Apple Silicon)
|
|
runs-on: warp-macos-15-arm64-6x
|
|
|
|
steps:
|
|
- name: Checkout
|
|
uses: actions/checkout@v4
|
|
with:
|
|
submodules: true
|
|
|
|
- name: Install Rust (stable)
|
|
uses: dtolnay/rust-toolchain@stable
|
|
|
|
- name: Install system dependencies
|
|
run: |
|
|
tooling/install-deps.sh
|
|
brew install opencolorio librsvg
|
|
|
|
- name: Configure build environment
|
|
run: |
|
|
{
|
|
echo "OCIO_RS_ENABLE_REAL=1"
|
|
echo "OCIO_INSTALL_DIR=/opt/homebrew/opt/opencolorio"
|
|
echo "OCIO_RS_LINK=dynamic"
|
|
echo "CFLAGS=-I/opt/homebrew/include"
|
|
echo "LDFLAGS=-L/opt/homebrew/lib"
|
|
echo "PKG_CONFIG_PATH=/opt/homebrew/lib/pkgconfig/openjpeg"
|
|
} >> "$GITHUB_ENV"
|
|
|
|
- name: Cache cargo artifacts
|
|
uses: Swatinem/rust-cache@v2
|
|
with:
|
|
shared-key: oak-workspace
|
|
|
|
- name: Cache project FFmpeg
|
|
uses: actions/cache@v4
|
|
with:
|
|
path: .cache/ffmpeg
|
|
key: ffmpeg-${{ runner.os }}-${{ hashFiles('tooling/ffmpeg/build-ffmpeg.sh') }}
|
|
|
|
- name: Build project FFmpeg (static, GPL + free codecs + hwaccel)
|
|
run: |
|
|
tooling/ffmpeg/build-ffmpeg.sh
|
|
echo "FFMPEG_DIR=$PWD/.cache/ffmpeg" >> "$GITHUB_ENV"
|
|
|
|
- name: Install cargo-packager
|
|
run: cargo install cargo-packager --locked
|
|
|
|
- name: Generate app icon (PNG from Oak_Icon.svg)
|
|
run: |
|
|
mkdir -p icons
|
|
# cargo-packager's tauri-icns 0.1.0 maps only 512x512@1x (and
|
|
# 1024x1024@2x); a plain 1024x1024 PNG aborts with "No matching
|
|
# IconType", so render 512x512.
|
|
rsvg-convert -w 512 -h 512 Oak_Icon.svg -o icons/icon.png
|
|
file icons/icon.png
|
|
|
|
# Build the packaged binaries (default members: the app, oak-cli,
|
|
# oak-worker). oakengine is a workspace member but NOT a default
|
|
# member (M14 R4: pure cdylib for plugins/external consumers — no
|
|
# packaged binary links it), so it is not built here.
|
|
- name: Build (release)
|
|
run: cargo build --release --locked
|
|
|
|
- name: Package .app bundle
|
|
run: cargo packager --release --formats app
|
|
|
|
- name: Create DMG
|
|
run: |
|
|
rm -rf dmg-staging
|
|
mkdir -p dmg-staging
|
|
cp -R target/release/Oak.app dmg-staging/
|
|
ln -s /Applications dmg-staging/Applications
|
|
hdiutil create -volname "Oak Video Editor" \
|
|
-srcfolder dmg-staging -ov -format UDZO Oak-macOS-arm64.dmg
|
|
|
|
- name: Upload artifact
|
|
uses: actions/upload-artifact@v4
|
|
with:
|
|
name: oak-macos
|
|
path: Oak-macOS-arm64.dmg
|
|
if-no-files-found: error
|
|
|
|
# ------------------------------------------------------------------
|
|
# Windows: NSIS installer — DISABLED. The app does not link on Windows
|
|
# yet: build.rs explicitly says "Windows: NOT SUPPORTED YET" (a DLL cannot
|
|
# carry the undefined oakcore_* imports without stub import-library /
|
|
# delay-load plumbing), and oak-cli/oak-worker build.rs emit GNU-style
|
|
# `-Wl` flags that the MSVC linker rejects. The NSIS packaging itself is
|
|
# fine (cargo-packager downloads its own makensis, SHA-1 verified); the
|
|
# blocker is the binary link. Re-enable this job once crates link on
|
|
# Windows; the job below is kept verbatim as the reference (the
|
|
# `-p oakengine` prebuild is obsolete since M14 R4 — no packaged binary
|
|
# links the cdylib — and should be dropped when re-enabling).
|
|
# ------------------------------------------------------------------
|
|
# windows:
|
|
# name: Windows installer (NSIS)
|
|
# runs-on: warp-windows-latest-x64-16x
|
|
#
|
|
# defaults:
|
|
# run:
|
|
# shell: msys2 {0}
|
|
#
|
|
# steps:
|
|
# - name: Checkout
|
|
# uses: actions/checkout@v4
|
|
# with:
|
|
# submodules: true
|
|
#
|
|
# - name: Install Rust (stable)
|
|
# uses: dtolnay/rust-toolchain@stable
|
|
#
|
|
# - name: Setup MSYS2
|
|
# uses: msys2/setup-msys2@v2
|
|
# with:
|
|
# msystem: UCRT64
|
|
# update: true
|
|
# install: >-
|
|
# git
|
|
# mingw-w64-ucrt-x86_64-gcc
|
|
#
|
|
# - name: Install system dependencies
|
|
# run: |
|
|
# bash tooling/install-deps.sh
|
|
# pacman -S --needed --noconfirm \
|
|
# mingw-w64-ucrt-x86_64-opencolorio \
|
|
# mingw-w64-ucrt-x86_64-librsvg
|
|
#
|
|
# - name: Configure build environment
|
|
# run: |
|
|
# echo "OCIO_RS_ENABLE_REAL=1" >> "$GITHUB_ENV"
|
|
# echo "OCIO_INSTALL_DIR=/ucrt64" >> "$GITHUB_ENV"
|
|
# echo "OCIO_RS_LINK=dynamic" >> "$GITHUB_ENV"
|
|
#
|
|
# - name: Cache cargo artifacts
|
|
# uses: Swatinem/rust-cache@v2
|
|
# with:
|
|
# shared-key: oak-workspace
|
|
#
|
|
# - name: Cache project FFmpeg
|
|
# uses: actions/cache@v4
|
|
# with:
|
|
# path: .cache/ffmpeg
|
|
# key: ffmpeg-${{ runner.os }}-${{ hashFiles('tooling/ffmpeg/build-ffmpeg.sh') }}
|
|
#
|
|
# - name: Build project FFmpeg (static, GPL + free codecs + hwaccel)
|
|
# run: |
|
|
# bash tooling/ffmpeg/build-ffmpeg.sh
|
|
# echo "FFMPEG_DIR=$(cygpath -m "$PWD/.cache/ffmpeg")" >> "$GITHUB_ENV"
|
|
#
|
|
# - name: Install cargo-packager
|
|
# run: cargo install cargo-packager --locked
|
|
#
|
|
# - name: Generate app icon (PNG from Oak_Icon.svg)
|
|
# run: |
|
|
# mkdir -p icons
|
|
# rsvg-convert -w 512 -h 512 Oak_Icon.svg -o icons/icon.png
|
|
#
|
|
# - name: Build (release)
|
|
# run: |
|
|
# cargo build --release --locked -p oakengine
|
|
# cargo build --release --locked
|
|
#
|
|
# - name: Package (NSIS)
|
|
# run: cargo packager --release --formats nsis
|
|
#
|
|
# - name: Upload artifact
|
|
# uses: actions/upload-artifact@v4
|
|
# with:
|
|
# name: oak-windows
|
|
# path: target/release/*-setup.exe
|
|
# if-no-files-found: error
|
|
|
|
# ------------------------------------------------------------------
|
|
# Publish: attach every platform package to the v* tag's GitHub release
|
|
# (skipped on workflow_dispatch, which only uploads artifacts). The
|
|
# Windows stays disabled (the app does not link there yet); macOS is
|
|
# back on the warp Apple Silicon runner.
|
|
# ------------------------------------------------------------------
|
|
release:
|
|
name: Publish GitHub release
|
|
needs: [linux, macos]
|
|
if: startsWith(github.ref, 'refs/tags/v')
|
|
runs-on: warp-ubuntu-latest-x64-8x
|
|
steps:
|
|
- name: Download all artifacts
|
|
uses: actions/download-artifact@v4
|
|
with:
|
|
path: artifacts
|
|
merge-multiple: true
|
|
|
|
- name: Publish release
|
|
uses: softprops/action-gh-release@v2
|
|
with:
|
|
tag_name: ${{ github.ref_name }}
|
|
name: ${{ github.ref_name }}
|
|
draft: false
|
|
files: artifacts/*
|