The open-source Arc replacement for macOS. Spaces, pinned tabs, split view, Little Windows and Arc's shortcuts on Chromium, with your Arc sidebar imported in one go.
CI runs each test once: coverage.py is the test run, and docs-only pushes skip CI
Victoraacf7c93b124
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.ymlindex bf9a808..57b6616 100644--- a/.github/workflows/ci.yml+++ b/.github/workflows/ci.yml@@ -1,9 +1,12 @@name: CI+# A change to docs alone runs nothing (and so doesn't cancel the run in progress).on:push:branches: [main]+ paths-ignore: ['**.md', 'docs/**', 'LICENSE']pull_request:+ paths-ignore: ['**.md', 'docs/**', 'LICENSE']concurrency:group: ci-${{ github.ref }}@@ -22,16 +25,22 @@ jobs:with:fetch-depth: 0- - name: CraCore, harnesses and lint- run: scripts/test.sh+ - name: Lint+ run: scripts/lint.py- # Changed lines under test >= 70 %, CraCore >= 85 % (docs/testing.md).- - name: Coverage+ # Every test once, compiled with coverage; a failing test fails this step with its output.+ # Gates: changed lines under test >= 70 %, CraCore >= 85 % (docs/testing.md).+ - name: CraCore, harnesses and coverageif: github.event_name == 'pull_request' || github.event.before != '0000000000000000000000000000000000000000'run: |set -o pipefailscripts/coverage.py --base "${{ github.event.pull_request.base.sha || github.event.before }}" | tee coverage.md+ # A new branch's first push has no base to measure changed lines against.+ - name: CraCore and harnesses+ if: github.event_name != 'pull_request' && github.event.before == '0000000000000000000000000000000000000000'+ run: scripts/test.sh+# Fork pull requests get a read-only token: the job summary has the same table.- name: Coverage commentif: always() && github.event_name == 'pull_request' && github.event.pull_request.head.repo.full_name == github.repositorydiff --git a/docs/development.md b/docs/development.mdindex 329e1ba..2735caf 100644--- a/docs/development.md+++ b/docs/development.md@@ -75,8 +75,9 @@ the save panel.[testing.md](testing.md) has the rules, the layers, the gates and how to write a scenario.-CI runs `scripts/test.sh` on every pull request (no CEF download) and the smoke test on the-app it builds.+CI runs the same tests on every pull request and push to main (no CEF download), once, through+`scripts/coverage.py` plus `scripts/lint.py`, and the smoke test on the app it builds. A change+to Markdown or `docs/` alone runs nothing.- `Packages/CraCore` (`swift test --package-path Packages/CraCore`): a package of its own, soits tests build without `vendor/cef`. Code that decides something without a window or adiff --git a/scripts/coverage.py b/scripts/coverage.pyindex 558e631..99357c6 100755--- a/scripts/coverage.py+++ b/scripts/coverage.py@@ -14,7 +14,11 @@ Runs every harness (scripts/test-*.sh, Tests/test-*.sh) compiled with coverage,- changed files no harness compiles (views, CEF glue) are listed, not counted: they arecovered by scenarios (scripts/scenario.sh), not by percentages.-The summary goes to stdout and, in CI, to the job summary (GITHUB_STEP_SUMMARY).+It is also CI's one run of those tests: a failing test fails it, with that suite's output, after+every suite has run. Lint is separate (scripts/lint.py).++The summary goes to stdout and, in CI, to the job summary (GITHUB_STEP_SUMMARY). Progress and+test failures go to stderr."""import globimport os@@ -34,7 +38,16 @@ def run(cmd, **kw):return subprocess.run(cmd, cwd=ROOT, check=True, text=True, capture_output=True, **kw).stdout-def harness_coverage(work):+def suite(name, cmd, failures, **kw):+ """Runs one test suite; a failure is kept with its output and the next suite still runs."""+ print(f"==> {name}", file=sys.stderr, flush=True)+ r = subprocess.run(cmd, cwd=ROOT, text=True, capture_output=True, **kw)+ if r.returncode != 0:+ failures.append(name)+ print(f"{r.stdout}{r.stderr}\n{name} failed", file=sys.stderr, flush=True)+++def harness_coverage(work, failures):"""{file: {line: count}} over every harness binary."""keep = os.path.join(work, "bin")os.makedirs(keep)@@ -45,9 +58,7 @@ def harness_coverage(work):rel = os.path.relpath(s, ROOT)if rel in NOT_HARNESSES:continue- r = subprocess.run(["bash", s], cwd=ROOT, env=env, text=True, capture_output=True)- if r.returncode != 0:- sys.exit(f"{rel} failed:\n{r.stdout[-2000:]}{r.stderr[-2000:]}")+ suite(rel, ["bash", s], failures, env=env)raws = glob.glob(os.path.join(work, "*.profraw"))binaries = sorted(glob.glob(os.path.join(keep, "*")))if not raws or not binaries:@@ -58,11 +69,13 @@ def harness_coverage(work):return lcov_lines(run(["xcrun", "llvm-cov", "export", "-format=lcov", "-instr-profile", merged] + objects))-def core_coverage():+def core_coverage(failures):pkg = os.path.join(ROOT, "Packages/CraCore")if not os.path.isdir(pkg):return {}- run(["swift", "test", "--package-path", pkg, "--enable-code-coverage"])+ suite("CraCore", ["swift", "test", "--package-path", pkg, "--enable-code-coverage"], failures)+ if "CraCore" in failures:+ return {}# Per line, as the harnesses are: the JSON's segments only mark where regions start, so the# other lines kept the 0 of a harness that compiles CraCore without running it.codecov = os.path.dirname(run(["swift", "test", "--package-path", pkg, "--show-codecov-path"]).strip())@@ -108,11 +121,15 @@ def pct(hit, total):def main():base = sys.argv[sys.argv.index("--base") + 1] if "--base" in sys.argv else "origin/main"work = tempfile.mkdtemp(prefix="cra-coverage.")+ failures = []try:- cov = harness_coverage(work)- core = core_coverage()+ cov = harness_coverage(work, failures)+ core = core_coverage(failures)finally:shutil.rmtree(work, ignore_errors=True)+ if failures:+ print("Failed: " + ", ".join(failures), file=sys.stderr)+ return 1for f, lines in core.items():merged = cov.setdefault(f, {})for n, count in lines.items():@@ -120,7 +137,7 @@ def main():table = ["| File | Lines | Covered |", "|---|---:|---:|"]for f in sorted(cov):- if not f.startswith(ROOT) or "/Tests/" in f:+ if not f.startswith(ROOT) or "/Tests/" in f or "/.build/" in f:continuelines = cov[f]hit = sum(1 for c in lines.values() if c > 0)