From 4637a84c8519c4ae8e16a42a62b6c194fe716ef0 Mon Sep 17 00:00:00 2001 From: Mike Solar Date: Sat, 22 Aug 2026 01:00:00 +0800 Subject: [PATCH] ci: split Linux and Windows into separate jobs; drop macOS MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The single matrix job becomes two independent jobs on the oak Gitea runners (oak-ubuntu-2404 / oak-windows-2025 — the user's labels, kept as-is). Every runner.os conditional collapses into the owning job and all macOS steps are removed. actionlint.yaml whitelists the two oak runner labels (actionlint needs -config-file now that the config lives under .gitea/ instead of the default .github/ path). --- .gitea/actionlint.yaml | 5 +- .gitea/workflows/ci.yml | 323 +++++++++++++++++++--------------------- 2 files changed, 156 insertions(+), 172 deletions(-) diff --git a/.gitea/actionlint.yaml b/.gitea/actionlint.yaml index 7ab1df735..998e221e3 100644 --- a/.gitea/actionlint.yaml +++ b/.gitea/actionlint.yaml @@ -1,7 +1,10 @@ # actionlint configuration: whitelist the custom self-hosted runner labels -# used by the CD workflow (Warp.dev runners) so `actionlint cd.yml` passes. +# used by the CI/CD workflows (Warp.dev runners on GitHub; the oak Gitea +# instance's runners) so `actionlint ci.yml` / `actionlint cd.yml` passes. # See https://github.com/rhysd/actionlint/blob/main/docs/config.md self-hosted-runner: labels: - ubuntu-latest - windows-latest + - oak-ubuntu-2404 + - oak-windows-2025 diff --git a/.gitea/workflows/ci.yml b/.gitea/workflows/ci.yml index 3dd290f1e..9ebe7cdab 100644 --- a/.gitea/workflows/ci.yml +++ b/.gitea/workflows/ci.yml @@ -16,16 +16,9 @@ permissions: contents: read jobs: - build-test: - name: Build & test (${{ matrix.os }}) - runs-on: ${{ matrix.os }} - strategy: - fail-fast: false - matrix: - os: - - ubuntu-latest - - windows-latest - + linux: + name: Build & test (Linux) + runs-on: oak-ubuntu-2404 steps: - name: Checkout uses: actions/checkout@v4 @@ -34,14 +27,10 @@ jobs: # their own repo and build as path dependencies of oakapp. submodules: true - - name: Install Rust (stable) - uses: dtolnay/rust-toolchain@stable - # ------------------------------------------------------------------ # System dependencies # ------------------------------------------------------------------ - - name: Install system dependencies (Linux) - if: runner.os == 'Linux' + - name: Install system dependencies run: | # Codec/filter libraries for the ffmpeg-sys-next build feature # (see tooling/install-deps.sh). @@ -57,28 +46,151 @@ jobs: libgl1-mesa-dev libgl1-mesa-dri mesa-vulkan-drivers \ libvulkan-dev libxkbcommon-dev libxkbcommon-x11-dev xvfb - - name: Install system dependencies (macOS) - if: runner.os == 'macOS' + # ------------------------------------------------------------------ + # Build environment + # ------------------------------------------------------------------ + # ocio-sys builds a stub bridge unless these are set; the oakcommon + # ocioutils tests need the real library (see crates/oakcommon/.cargo/ + # config.toml, which only applies to builds run from that directory). + # ocio-sys builds its vendored OpenColorIO from source on Linux (the + # `bundled` feature; the distro package is too old for the bridge), + # so no OCIO_INSTALL_DIR here. + - name: Configure build environment run: | - tooling/install-deps.sh - brew install cmake + echo "OCIO_RS_ENABLE_REAL=1" >> "$GITHUB_ENV" + echo "OCIO_RS_LINK=static" >> "$GITHUB_ENV" - - name: Setup MSYS2 (Windows) - if: runner.os == 'Windows' - uses: msys2/setup-msys2@v2 + # ------------------------------------------------------------------ + # Caches + # ------------------------------------------------------------------ + # Covers the whole target/ dir plus ~/.cargo; shared across branches + # of the same OS. + # TEMP: cache disabled until the Gitea instance cache is provisioned (Cache cargo artifacts) + # uses: Swatinem/rust-cache@v2 + # with: + # shared-key: oak-workspace + # cache-on-failure: true + + # The project FFmpeg (release/8.0, static, all free codecs + hwaccel) + # is built by tooling/ffmpeg/build-ffmpeg.sh — 10-20 min on a cold + # cache. It does not depend on the Rust toolchain, so key it on the + # script itself and keep it out of rust-cache. + # TEMP: cache disabled until the Gitea instance cache is provisioned (Cache project FFmpeg) + # uses: actions/cache@v4 + # with: + # path: .cache/ffmpeg + # key: ffmpeg-${{ runner.os }}-${{ hashFiles('tooling/ffmpeg/build-ffmpeg.sh') }} + + # ------------------------------------------------------------------ + # Project FFmpeg (script + FFMPEG_DIR; see docs/build.md) + # ------------------------------------------------------------------ + - name: Build project FFmpeg + run: | + tooling/ffmpeg/build-ffmpeg.sh + echo "FFMPEG_DIR=$PWD/.cache/ffmpeg" >> "$GITHUB_ENV" + + # ------------------------------------------------------------------ + # Build & test + # ------------------------------------------------------------------ + - name: Build + run: cargo build --workspace --locked + + # xvfb + 24-bit screen: the gpui #[gpui::test] tests open real windows + # and render through wgpu on Mesa's software Vulkan (lavapipe). + # The watchdog bounds the step: a deadlocked test produces no output + # and no failure, so after 1500 s (a green run needs ~4 min) it dumps + # every hung process's thread stacks and kills the suite. + - name: Test + run: | + sudo apt-get install -y gdb + xvfb-run -a -s "-screen 0 1920x1080x24" cargo test --workspace --locked & + TEST_PID=$! + ( + sleep 1500 + echo "::warning::test suite exceeded 1500s; dumping hung-process stacks" + for p in $(pgrep -f 'target/debug/deps/|target/debug/oak-worker'); do + echo "===== thread stacks of pid $p ($(readlink /proc/$p/exe 2>/dev/null)) =====" + sudo gdb -batch -ex 'thread apply all bt' -p "$p" || true + done + pkill -9 -f 'target/debug/deps/' || true + pkill -9 -f 'target/debug/oak-worker' || true + ) & + WATCHDOG_PID=$! + wait $TEST_PID + rc=$? + kill $WATCHDOG_PID 2>/dev/null || true + exit $rc + + # A crashing (SIGSEGV) test gives no Rust backtrace; rerun the + # crashing test binaries under gdb to capture the native stack. + # `--args` is required — plain `--` makes gdb treat the test args as + # a core file. The extra probes target loader-stage crashes (the + # copier_test SIGSEGV happens inside ld.so's dl_main): si_addr/si_code + # pin down the fault type, the dynsym dump exposes symbols the + # executable exports for interposition, strace shows the last loader + # syscalls, and valgrind catches a corrupting static initializer. + - name: Backtrace on test failure + if: failure() + run: | + sudo apt-get install -y gdb strace valgrind + for name in node_e2e_test suites_test copier_test; do + BIN=$(ls -t target/debug/deps/$name-* | grep -v '\.d$' | head -1) + [ -n "$BIN" ] || continue + echo "===== $BIN =====" + file "$BIN" || true + echo "--- exported defined dynsyms:" + readelf --dyn-syms -W "$BIN" 2>/dev/null | grep -v ' UND ' | tail -n +4 | head -30 || true + echo "--- strace tail:" + strace -f "$BIN" --list 2>&1 | tail -15 || true + echo "--- valgrind tail:" + valgrind -q "$BIN" --list 2>&1 | tail -25 || true + echo "--- gdb:" + xvfb-run -a gdb -batch \ + -ex run \ + -ex 'bt' \ + -ex 'p $_siginfo.si_code' \ + -ex 'p/x $_siginfo._sifields._sigfault.si_addr' \ + -ex 'x/6i $rip' \ + --args "$BIN" --nocapture || true + done + + # ------------------------------------------------------------------ + # OFX plugin discovery end-to-end + # ------------------------------------------------------------------ + # Build a minimal but real OFX plugin into a .ofx.bundle, point + # OFX_PLUGIN_PATH at it and let the scan_probe example run the full + # host path (directory scan -> dlopen -> setHost -> load -> describe + # -> register). The assertion is the plugin's registration line; CI + # machines have no system-wide OFX plugins, so the fixture is the + # only discovery. + - name: Build OFX fixture plugin + run: crates/oakplugin/tests/fixtures/build_fixture.sh .cache/ofx-fixture + + - name: Probe OFX plugin discovery + run: | + OFX_PLUGIN_PATH="$PWD/.cache/ofx-fixture" \ + cargo run --locked -p oakplugin --example scan_probe > probe.log 2>&1 + grep -q 'type_id=rs.oak.CiTestPlugin' probe.log + # A project carrying a plugin node must survive save/load (the + # serializer resolves plugin types via the dynamic factory). + OAK_OFX_FIXTURE_DIR="$PWD/.cache/ofx-fixtre" \ + cargo test --locked -p oakplugin --test ofx_roundtrip + + windows: + name: Build & test (Windows) + runs-on: oak-windows-2025 + steps: + - name: Checkout + uses: actions/checkout@v4 with: - msystem: UCRT64 - update: true - # MSYS2's own Rust targets x86_64-pc-windows-gnu by default — - # the Windows build is GNU-target (the MSVC linker rejects the - # Unix-style link args the build scripts emit). - install: >- - git - mingw-w64-ucrt-x86_64-gcc - mingw-w64-ucrt-x86_64-rust + # gpui/ is a git submodule; its crates are workspace members of + # their own repo and build as path dependencies of oakapp. + submodules: true - - name: Install system dependencies (Windows) - if: runner.os == 'Windows' + # ------------------------------------------------------------------ + # System dependencies + # ------------------------------------------------------------------ + - name: Install system dependencies shell: msys2 {0} run: | bash tooling/install-deps.sh @@ -89,38 +201,12 @@ jobs: # ------------------------------------------------------------------ # Build environment # ------------------------------------------------------------------ - # ocio-sys builds a stub bridge unless these are set; the oakcommon - # ocioutils tests need the real library (see crates/oakcommon/.cargo/ - # config.toml, which only applies to builds run from that directory). - # ocio-sys builds its vendored OpenColorIO from source on Linux (the - # `bundled` feature; the distro package is too old for the bridge), - # so no OCIO_INSTALL_DIR here. macOS/Windows keep the system library. - - name: Configure build environment (Linux) - if: runner.os == 'Linux' - run: | - echo "OCIO_RS_ENABLE_REAL=1" >> "$GITHUB_ENV" - echo "OCIO_RS_LINK=static" >> "$GITHUB_ENV" - - - name: Configure build environment (macOS) - if: runner.os == 'macOS' - run: | - # OCIO comes from the ocio-sys vendored source build (same on - # every platform); no OCIO_INSTALL_DIR override. - echo "OCIO_RS_ENABLE_REAL=1" >> "$GITHUB_ENV" - echo "OCIO_RS_LINK=static" >> "$GITHUB_ENV" - # Homebrew quirks: lame.pc / snappy / libopenjp2.pc live off the - # default pkg-config search paths (see docs/build.md). - echo "CFLAGS=-I/opt/homebrew/include" >> "$GITHUB_ENV" - echo "LDFLAGS=-L/opt/homebrew/lib" >> "$GITHUB_ENV" - echo "PKG_CONFIG_PATH=/opt/homebrew/lib/pkgconfig/openjpeg" >> "$GITHUB_ENV" - - - name: Configure build environment (Windows) - if: runner.os == 'Windows' + # Windows uses the MSYS2 OpenColorIO package (the exact 2.5.2 the + # bridge targets; the vendored source needs MSVC-only constructs). + # Dynamic here — the CD packages the DLLs next to the binaries. + - name: Configure build environment shell: msys2 {0} run: | - # Windows uses the MSYS2 OpenColorIO package (the exact 2.5.2 the - # bridge targets; the vendored source needs MSVC-only constructs). - # Dynamic here — the CD packages the DLLs next to the binaries. echo "OCIO_RS_ENABLE_REAL=1" >> "$GITHUB_ENV" echo "OCIO_INSTALL_DIR=/ucrt64" >> "$GITHUB_ENV" echo "OCIO_RS_LINK=dynamic" >> "$GITHUB_ENV" @@ -166,14 +252,7 @@ jobs: # ------------------------------------------------------------------ # Project FFmpeg (script + FFMPEG_DIR; see docs/build.md) # ------------------------------------------------------------------ - - name: Build project FFmpeg (Linux/macOS) - if: runner.os != 'Windows' - run: | - tooling/ffmpeg/build-ffmpeg.sh - echo "FFMPEG_DIR=$PWD/.cache/ffmpeg" >> "$GITHUB_ENV" - - - name: Build project FFmpeg (Windows) - if: runner.os == 'Windows' + - name: Build project FFmpeg shell: msys2 {0} run: | bash tooling/ffmpeg/build-ffmpeg.sh @@ -182,16 +261,7 @@ jobs: # ------------------------------------------------------------------ # Build & test # ------------------------------------------------------------------ - - name: Build (Linux) - if: runner.os == 'Linux' - run: cargo build --workspace --locked - - - name: Build (macOS) - if: runner.os == 'macOS' - run: cargo build --workspace --locked - - - name: Build (Windows) - if: runner.os == 'Windows' + - name: Build shell: msys2 {0} run: | # The runner's job hook injects the MSVC INCLUDE/LIB into every @@ -206,72 +276,7 @@ jobs: export RUSTFLAGS="-C link-args=-lmsvcrt" cargo build --workspace --locked - # xvfb + 24-bit screen: the gpui #[gpui::test] tests open real windows - # and render through wgpu on Mesa's software Vulkan (lavapipe). - # The watchdog bounds the step: a deadlocked test produces no output - # and no failure, so after 1500 s (a green run needs ~4 min) it dumps - # every hung process's thread stacks and kills the suite. - - name: Test (Linux) - if: runner.os == 'Linux' - run: | - sudo apt-get install -y gdb - xvfb-run -a -s "-screen 0 1920x1080x24" cargo test --workspace --locked & - TEST_PID=$! - ( - sleep 1500 - echo "::warning::test suite exceeded 1500s; dumping hung-process stacks" - for p in $(pgrep -f 'target/debug/deps/|target/debug/oak-worker'); do - echo "===== thread stacks of pid $p ($(readlink /proc/$p/exe 2>/dev/null)) =====" - sudo gdb -batch -ex 'thread apply all bt' -p "$p" || true - done - pkill -9 -f 'target/debug/deps/' || true - pkill -9 -f 'target/debug/oak-worker' || true - ) & - WATCHDOG_PID=$! - wait $TEST_PID - rc=$? - kill $WATCHDOG_PID 2>/dev/null || true - exit $rc - - # A crashing (SIGSEGV) test gives no Rust backtrace; rerun the - # crashing test binaries under gdb to capture the native stack. - # `--args` is required — plain `--` makes gdb treat the test args as - # a core file. The extra probes target loader-stage crashes (the - # copier_test SIGSEGV happens inside ld.so's dl_main): si_addr/si_code - # pin down the fault type, the dynsym dump exposes symbols the - # executable exports for interposition, strace shows the last loader - # syscalls, and valgrind catches a corrupting static initializer. - - name: Backtrace on test failure (Linux) - if: failure() - run: | - sudo apt-get install -y gdb strace valgrind - for name in node_e2e_test suites_test copier_test; do - BIN=$(ls -t target/debug/deps/$name-* | grep -v '\.d$' | head -1) - [ -n "$BIN" ] || continue - echo "===== $BIN =====" - file "$BIN" || true - echo "--- exported defined dynsyms:" - readelf --dyn-syms -W "$BIN" 2>/dev/null | grep -v ' UND ' | tail -n +4 | head -30 || true - echo "--- strace tail:" - strace -f "$BIN" --list 2>&1 | tail -15 || true - echo "--- valgrind tail:" - valgrind -q "$BIN" --list 2>&1 | tail -25 || true - echo "--- gdb:" - xvfb-run -a gdb -batch \ - -ex run \ - -ex 'bt' \ - -ex 'p $_siginfo.si_code' \ - -ex 'p/x $_siginfo._sifields._sigfault.si_addr' \ - -ex 'x/6i $rip' \ - --args "$BIN" --nocapture || true - done - - - name: Test (macOS) - if: runner.os == 'macOS' - run: cargo test --workspace --locked - - - name: Test (Windows) - if: runner.os == 'Windows' + - name: Test shell: msys2 {0} run: | unset INCLUDE LIB @@ -287,27 +292,3 @@ jobs: echo "first pass failed; retrying once for gpui keystroke flakes" cargo test --workspace --locked fi - - # ------------------------------------------------------------------ - # OFX plugin discovery end-to-end - # ------------------------------------------------------------------ - # Build a minimal but real OFX plugin into a .ofx.bundle, point - # OFX_PLUGIN_PATH at it and let the scan_probe example run the full - # host path (directory scan -> dlopen -> setHost -> load -> describe - # -> register). The assertion is the plugin's registration line; CI - # machines have no system-wide OFX plugins, so the fixture is the - # only discovery. - - name: Build OFX fixture plugin (Linux/macOS) - if: runner.os != 'Windows' - run: crates/oakplugin/tests/fixtures/build_fixture.sh .cache/ofx-fixture - - - name: Probe OFX plugin discovery (Linux/macOS) - if: runner.os != 'Windows' - run: | - OFX_PLUGIN_PATH="$PWD/.cache/ofx-fixture" \ - cargo run --locked -p oakplugin --example scan_probe > probe.log 2>&1 - grep -q 'type_id=rs.oak.CiTestPlugin' probe.log - # A project carrying a plugin node must survive save/load (the - # serializer resolves plugin types via the dynamic factory). - OAK_OFX_FIXTURE_DIR="$PWD/.cache/ofx-fixtre" \ - cargo test --locked -p oakplugin --test ofx_roundtrip