Skip to content

ci: the example repos are checked at main again #598

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
foxnne merged 2 commits into from
Oct 19, 2026
Merged

ci: the example repos are checked at main again #598

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2147d91
ci: the example repos are checked at main again
foxnne Oct 18, 2026
793a114
Merge main into ci/examples-main
foxnne Oct 19, 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
14 changes: 6 additions & 8 deletions docs/DEPENDENCIES.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ bump it; keep it current whenever a pin or a patch moves.

| Dependency | Upstream | Fizzy's changes | Pinned in | Carries |
|---|---|---|---|---|
| [`foxnne/dvui-dev`](https://github.com/foxnne/dvui-dev) | [`david-vanderson/dvui`](https://github.com/david-vanderson/dvui) | branch `fizzy-dev` | `sdk/build.zig.zon` | dvui changes fizzy needs |
| [`foxnne/dvui-dev`](https://github.com/foxnne/dvui-dev) | [`david-vanderson/dvui`](https://github.com/david-vanderson/dvui) | branch `zig-0.17` (on 0.16, `fizzy-dev`) | `sdk/build.zig.zon` | dvui changes fizzy needs |
| SDL | [`libsdl-org/SDL`](https://github.com/libsdl-org/SDL) `release-3.4.16` | `backend/patches/sdl` | `backend/build.zig.zon` (`.sdl_source`) | SDL C patches, applied by [zig-patch](https://github.com/marler8997/zig-patch) (below) |
| [`fizzyedit/sdl_zig`](https://github.com/fizzyedit/sdl_zig) | [`Games-By-Mason/sdl_zig`](https://github.com/Games-By-Mason/sdl_zig) | branch `fizzy` | `backend/build.zig.zon` (`.sdl`) | the Zig build of SDL, taking the patched tree |

Expand Down Expand Up @@ -133,9 +133,8 @@ backend and never link SDL, so an SDL bump is never an SDK release and never mov
Each of 5 and 6 is also a branch of its own on upstream `main` (`window-draw-retained`,
`screens-set`), from which the upstream PR is opened.

**On fizzy's `zig/0.17` branch** the pin is `foxnne/dvui-dev` branch `zig-0.17`, by commit and
as `git+https` (Zig 0.17 hashes this repo's GitHub archive wrongly; `docs/PITFALLS.md`): the eight
above rebased onto upstream `main` (`41f6703`), then:
**Since fizzy moved to Zig 0.17 (#575)** the pin is `foxnne/dvui-dev` branch `zig-0.17`, by tag and
as `git+https`: the eight above rebased onto upstream `main` (`41f6703`), then:

9. **floatingWindow: a backend may show one in an OS window of its own** (`bd7736d`). Patch 8's
`osWindowFloating` became `Backend.floatingWindowOs(id, open_flag, min, max)`, asked as
Expand All @@ -155,8 +154,6 @@ above rebased onto upstream `main` (`41f6703`), then:
kind and a lifted finger hovers nothing; `cursorSet` takes a priority, so a resize handle's
cursor wins, and a floating window's edges ask at normal priority.

Tagged `fizzy-sdk-*` when `zig/0.17` merges to `main`, as rule 2 says.

Tags: `fizzy-sdk-0.2.13` → `712f7f7` (the stack before this rebase, still what SDK ≤ 0.2.15
builds); `fizzy-sdk-0.2.16` → `4428108` (SDK 0.2.16 to 0.2.18); `fizzy-sdk-0.2.19` →
`f8b32db`; `fizzy-sdk-0.2.19-2` → `a90bc70` (0.2.19 was not released yet, and a tag never
Expand All @@ -166,8 +163,9 @@ moves, so the second pin of one version takes a suffix, as the SDL fork's tags d
`e2c9a85` (item 9 alone, never pinned); `fizzy-sdk-0.2.30-2` → `fdc03d4` (pinned by #540);
`fizzy-sdk-0.2.30-3` → `cc60612` (never
pinned); `fizzy-sdk-0.2.30-4` → `44010a3`; `fizzy-sdk-0.2.30-5` →
`20e56f1` (never pinned on `main`); `fizzy-sdk-0.2.30-6` → `40e664c`, what `sdk/build.zig.zon`
pins now.
`20e56f1` (never pinned on `main`); `fizzy-sdk-0.2.30-6` → `40e664c`, the last pin on Zig 0.16;
`fizzy-sdk-0.2.30-7` → `1b29a16` on `zig-0.17`, what `sdk/build.zig.zon` pins now (SDK 0.2.30, the
first on Zig 0.17).

Fizzy builds dvui in its `custom` backend mode on every target and links its own backends
(`backend/`, `src/backend/WebBackend.zig` + `web/web.js`), so dvui's `sdl3` and `web`
Expand Down
9 changes: 1 addition & 8 deletions scripts/check-examples.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,14 +50,7 @@ for repo in example-app example-plugin; do
mkdir -p "$work/$repo"
pack "$EXAMPLES_DIR/$repo" | tar -x -C "$work/$repo"
else
# ZIG017: each example's zig-0.17 branch while it has one, `main` once its 0.17 PR has landed
# and the branch is gone (example-plugin's did first, and the clone of a branch no longer
# there failed every fizzy pull request). When both have landed, `main` alone, in a PR of
# its own.
url="https://github.com/fizzyedit/$repo"
ref="${EXAMPLES_REF:-zig-0.17}"
if ! git ls-remote --exit-code --heads "$url" "$ref" >/dev/null; then ref=main; fi
git clone --quiet --depth 1 --branch "$ref" "$url" "$work/$repo"
git clone --quiet --depth 1 "https://github.com/fizzyedit/$repo" "$work/$repo"
fi
done

Expand Down
2 changes: 1 addition & 1 deletion sdk/build.zig.zon
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
// `fizzy-sdk-<version>` tag in the fork before the pin lands. `fizzy-dev` itself stays a
// working branch and can be rebased freely — the tag, never.
.dvui = .{
// zig-0.17 branch (zig/0.17 pins a commit; tagged when it merges to main)
// fizzy-sdk-0.2.30-7, on the zig-0.17 branch (docs/DEPENDENCIES.md)
.url = "git+https://github.com/foxnne/dvui-dev#1b29a16d0340005c0d5ed2b689a7ffab797b1c37",
.hash = "dvui-0.6.0-dev-AQFJmXGtBAE8dNSt4nGJ7ToMZ9HR7rdMVubvTlhzO-mk",
//.path = "../../dvui-dev",
Expand Down
Loading