Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
3e69ec2
feat(observability): add managed monitoring stack and diagnostics
happy-v587 Oct 22, 2026
8c44446
fix(ci): check observability resource licenses
happy-v587 Nov 2, 2026
5fa867f
fix(ci): keep OTLP checks optional after master rebase
happy-v587 Nov 2, 2026
fdb7b1a
fix(ci): align observability fixtures and worker diagnostics
happy-v587 Nov 3, 2026
3489cd7
test(zcode): verify durable pause after scope timeout
happy-v587 Nov 3, 2026
2ee2cbb
fix(packaging): declare psutil as a server dependency
happy-v587 Nov 3, 2026
03efa42
fix(observability): repair reference demo signal correlation
happy-v587 Nov 3, 2026
9dfd1be
fix(observability): color status output and send valid TraceQL explor…
happy-v587 Nov 3, 2026
e319e85
fix(observability): reject log-specific exporter overrides
happy-v587 Nov 3, 2026
01ebe73
fix(ci): retry busy macOS image detach failures
happy-v587 Nov 3, 2026
a60e8e2
test(zcode): allow bounded initial recall timeouts
happy-v587 Nov 3, 2026
5eebbb6
fix(runtime): retain failure evidence across policy blocks
happy-v587 Nov 4, 2026
f999706
fix(ci): qualify merged ownership and observability contracts
happy-v587 Nov 4, 2026
8fa87c4
docs(desktop): record merged source evidence qualification
happy-v587 Nov 4, 2026
f969713
test(logging): accept declared service owner identity
happy-v587 Nov 4, 2026
e60384d
fix(ci): budget complete backend acceptance lifecycles
happy-v587 Nov 4, 2026
23bbf41
test(ci): isolate nested pytest runtime options
happy-v587 Nov 4, 2026
75239cf
chore(desktop): regenerate statistics observation bindings
happy-v587 Nov 4, 2026
581cf26
fix(desktop): accept optional statistics observations
happy-v587 Nov 4, 2026
e4d5e87
test(desktop): qualify combined statistics protocol
happy-v587 Nov 4, 2026
01dd266
docs(desktop): record statistics product qualification
happy-v587 Nov 4, 2026
63755a0
fix(ci): budget OceanBase clean migration lifecycles
happy-v587 Nov 4, 2026
06cff31
merge: sync master and preserve macOS DMG diagnostics
happy-v587 Nov 5, 2026
2722e8f
fix(ci): isolate macOS build retry fixtures after master sync
happy-v587 Nov 5, 2026
5e85e0f
merge: sync master and unify migration test budgets
happy-v587 Nov 5, 2026
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
Prev Previous commit
Next Next commit
fix(ci): retry busy macOS image detach failures
  • Loading branch information
happy-v587 committed Nov 4, 2026
commit 01ebe73b694dd68dbb3f9a85476ee37e6442eb9d
2 changes: 2 additions & 0 deletions .github/workflows/desktop.yml
Original file line number Diff line number Diff line change
Expand Up @@ -215,6 +215,7 @@ jobs:
else
build_status=$?
fi
# Both image creation and detach can encounter transient DiskImages locks.
if [ "$attempt" -eq 3 ] || ! grep -Eq "hdiutil: (create failed - Resource busy|couldn't eject .* - Resource busy)" "$attempt_log"; then
exit "$build_status"
fi
Expand All @@ -226,6 +227,7 @@ jobs:
uses: actions/upload-artifact@cf430e030ddbb5b0abf93d22962f4752f3646cd9 # v7
with:
name: desktop-macos-${{ matrix.runner }}-build-diagnostics
include-hidden-files: true
path: |
desktop/.artifacts/macos-build*.log
desktop/src-tauri/target/release/bundle/dmg/bundle_dmg.sh
Expand Down
51 changes: 51 additions & 0 deletions tests/test_ci_pipeline.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@

import json
import os
import shutil
import subprocess
import sys
import tomllib
Expand All @@ -31,6 +32,56 @@
RULES = tomllib.loads((ROOT / ".github/ci-paths.toml").read_text())


@pytest.mark.skipif(sys.platform == "win32", reason="macOS bundling uses POSIX executables")
@pytest.mark.parametrize(
("failures", "expected_status", "expected_attempts"),
[
(['hdiutil: couldn\'t eject "disk2" - Resource busy'], 0, 2),
(["hdiutil: create failed - Resource busy"], 0, 2),
(["error: application compilation failed"], 17, 1),
(["another tool: Resource busy"], 17, 1),
(['hdiutil: couldn\'t eject "disk2" - Resource busy'] * 3, 17, 3),
],
)
def test_macos_build_retries_only_busy_disk_images(tmp_path, monkeypatch, failures, expected_status, expected_attempts):
bash = shutil.which("bash")
if bash is None:
pytest.skip("Bash is required to execute the macOS build step")
bin_dir = tmp_path / "bin"
bin_dir.mkdir()
driver = bin_dir / "pnpm"
driver.write_text(
f"#!{sys.executable}\n"
"import json, os, sys\n"
"from pathlib import Path\n"
"count = Path('build-attempts')\n"
"attempt = int(count.read_text()) + 1 if count.exists() else 1\n"
"count.write_text(str(attempt))\n"
"failures = json.loads(os.environ['TEST_BUILD_FAILURES'])\n"
"if attempt <= len(failures):\n"
" print(failures[attempt - 1], file=sys.stderr)\n"
" sys.exit(17)\n"
)
driver.chmod(0o755)
sleep = bin_dir / "sleep"
sleep.write_text("#!/bin/sh\nexit 0\n")
sleep.chmod(0o755)
monkeypatch.setenv("PATH", str(bin_dir) + os.pathsep + os.environ["PATH"])
monkeypatch.setenv("TEST_BUILD_FAILURES", json.dumps(failures))
command = next(
step["run"]
for step in workflow("desktop.yml")["jobs"]["macos"]["steps"]
if step.get("name") == "Build unsigned macOS app and DMG"
)
result = subprocess.run(
[bash, "-c", command], cwd=tmp_path, capture_output=True, text=True, timeout=10, check=False
)
assert result.returncode == expected_status, result.stdout + result.stderr
# The external recovery budget is three builds; other build failures are terminal.
assert int((tmp_path / "build-attempts").read_text()) == expected_attempts
assert failures[0] in (tmp_path / ".artifacts" / "macos-build.log").read_text()


def workflow(name):
result = yaml.safe_load((ROOT / ".github/workflows" / name).read_text())
result["on"] = result.pop(True)
Expand Down