Skip to content

Merge main into develop: line endings, dependency bumps, Node 24 actions - #117

Open
addisdev wants to merge 9 commits into
developfrom
claude/determined-bohr-32nsy5
Open

addisdev wants to merge 9 commits into
developfrom
claude/determined-bohr-32nsy5

Conversation

@addisdev

@addisdev addisdev commented Oct 26, 2026 •

Copy link
Copy Markdown
Owner

What and why

This back-merges main into develop with a merge commit (43d93fe). It brings over everything that landed on main without going through develop:

PR What
#116 runner-android/gradlew.bat and docs/figures/fonts/OFL-IBMPlex.txt stored with LF, as .gitattributes says
#113 fast-uri 3.1.9 / 4.2.3 in collector/
#109 fastify 5.12.6 in collector/
#110 vite 7.3.7 in collector/dash/
#112 Node.js 24 majors for the actions the workflows call (develop still has actions/checkout@v4 and friends)
#114 already on develop as #111; the change is identical, so it merges as a no-op

Plus one fix the runners forced on us (68c0a5e). The first CI run failed desktop / launch smoke at apt-get: Package 'webkit2gtk-driver' has no installation candidate. ubuntu-latest has started giving out ubuntu-26.04 images, where that package is replaced by webkitgtk-webdriver (it still ships /usr/bin/WebKitWebDriver). #114's green run the day before was on ubuntu-24.04. This PR's change didn't cause it, and main has the same desktop.yml. The Linux dependencies step now installs webkitgtk-webdriver when apt has a candidate for it and webkit2gtk-driver otherwise. apt-cache show would be the wrong test: 24.04 knows the new name but has nothing to install under it. launch-smoke.sh's hint names both packages.

The merge had no conflicts. Apart from 68c0a5e, this branch differs from main only by develop's own #115 (CHANGELOG.md, nightly-builds.sh, docs/deploy/explore-on-ultra.md). Every main commit is an ancestor of the head.

Please merge this with a merge commit, not a squash. A squash would drop main's commits from develop's history, and the next develop → main release would have to merge the same changes again.

Labelled no-changelog: none of these is user-visible, and the earlier dependency bumps (#64, #71, #72) had no changelog lines either. Without the label, this PR's merge commit would fail changelog coverage on the next release PR.

Verified

  • node scripts/version.mjs check, node --test scripts/*.test.mjs (17 pass), node scripts/check-counts.mjs: all pass.
  • cd collector && npm ci && npm --prefix dash ci && CI=1 npm test: ALL PASS, with fastify 5.12.6, fast-uri 3.1.9/4.2.3 and vite 7.3.7 installed (dashboard typecheck and build included). Run with NODE_PATH unset; the sandbox's global Playwright otherwise trips one browser test that CI does not see.
  • Driver choice against real package indexes, with pipefail on. Ubuntu 24.04 (noble) → webkit2gtk-driver 2.52.6 (apt-get install -s resolves). Ubuntu 26.04 (resolute main + universe) → webkitgtk-webdriver 2.52.0-1. Every other package in the step has a 26.04 candidate. The 26.04 .deb contains /usr/bin/WebKitWebDriver.
  • desktop.yml parses; the step script and launch-smoke.sh pass bash -n.
  • A fresh checkout is clean: gradlew.bat reads i/lf w/crlf, OFL-IBMPlex.txt reads i/lf w/lf.
  • CI on 68c0a5e: the workflow files change, so every suite runs.

What is still not true

  • Not run here: the desktop app build and launch on 26.04 past the apt step (Tauri and tauri-driver against WebKitGTK 2.52.0 there), or the fleet, runner-machine, Android, iOS and Roku suites. CI on this PR runs them.
  • main still installs webkit2gtk-driver unconditionally, so any main PR that runs the desktop suite on a 26.04 runner will fail the same way until this reaches it.

🤖 Generated with Claude Code

https://claude.ai/code/session_019jHjgRysB6GajV3oDppruf

addisdev and others added 8 commits October 22, 2026 23:26
…112)

Version bumps only, plus inputs that keep today's behaviour.

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
always() also ran ci-ok on a run that concurrency cancel-in-progress had
cancelled, and it failed on the cancelled jobs: 18 of the 25 ci-ok failures
10-11..10-21 were that. Cherry-pick of 56cb295 (#111) from develop. A
cancelled run's ci-ok now concludes cancelled (checked on this PR), which
still does not satisfy the required check.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_019jHjgRysB6GajV3oDppruf
Bumps [vite](https://github.com/vitejs/vite/tree/HEAD/packages/vite) from 7.3.6 to 7.3.7.
- [Release notes](https://github.com/vitejs/vite/releases)
- [Changelog](https://github.com/vitejs/vite/blob/v7.3.7/packages/vite/CHANGELOG.md)
- [Commits](https://github.com/vitejs/vite/commits/v7.3.7/packages/vite)

---
updated-dependencies:
- dependency-name: vite
  dependency-version: 7.3.7
  dependency-type: direct:development
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Bumps [fastify](https://github.com/fastify/fastify) from 5.12.5 to 5.12.6.
- [Release notes](https://github.com/fastify/fastify/releases)
- [Commits](fastify/fastify@v5.12.5...v5.12.6)

---
updated-dependencies:
- dependency-name: fastify
  dependency-version: 5.12.6
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Bumps  and [fast-uri](https://github.com/fastify/fast-uri). These dependencies needed to be updated together.

Updates `fast-uri` from 3.1.8 to 3.1.9
- [Release notes](https://github.com/fastify/fast-uri/releases)
- [Commits](fastify/fast-uri@v3.1.8...v3.1.9)

Updates `fast-uri` from 4.2.1 to 4.2.3
- [Release notes](https://github.com/fastify/fast-uri/releases)
- [Commits](fastify/fast-uri@v3.1.8...v3.1.9)

---
updated-dependencies:
- dependency-name: fast-uri
  dependency-version: 3.1.9
  dependency-type: indirect
- dependency-name: fast-uri
  dependency-version: 4.2.3
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
… says (#116)

* runner-android: store gradlew.bat with LF, as .gitattributes says

.gitattributes marks *.bat as `text eol=crlf`: LF in the repository, CRLF
in the working tree. gradlew.bat was committed with CRLF inside the
repository, so git reported it as modified on every fresh checkout, with
nobody having touched it. Renormalized with `git add --renormalize`. The
content is unchanged apart from line endings, and a checkout still writes
CRLF, which is what cmd.exe needs.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_019jHjgRysB6GajV3oDppruf

* docs: store the IBM Plex OFL licence with LF, as .gitattributes says

`* text=auto eol=lf` wants LF both in the repository and on checkout.
OFL-IBMPlex.txt was committed with CRLF, the one text file under
docs/figures/fonts/ that was (OFL-Bricolage.txt is LF). Renormalized
with `git add --renormalize`; the licence text is unchanged apart from
line endings.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_019jHjgRysB6GajV3oDppruf

---------

Co-authored-by: Claude <noreply@anthropic.com>
Brings back what landed on main without going through develop:
#112 (Node.js 24 action majors), #114 (already here as #111; identical),
#110 vite 7.3.7, #109 fastify 5.12.6, #113 fast-uri, and #116 (gradlew.bat
and OFL-IBMPlex.txt stored with LF).

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_019jHjgRysB6GajV3oDppruf
@addisdev addisdev added the no-changelog Exempt from the release changelog coverage check label Oct 26, 2026 — with Claude
ubuntu-latest has started handing out ubuntu-26.04 images, where
webkit2gtk-driver is gone ("no installation candidate"; replaced by
webkitgtk-webdriver, which still ships /usr/bin/WebKitWebDriver). The
desktop launch smoke failed at apt-get on PR #117's first run; #114's
green run the day before was on ubuntu-24.04.

Pick the package by whether apt has a candidate for the new name:
`apt-cache show` succeeds on 24.04 too, which knows the name and has
nothing to install under it. Checked against both releases' indexes:
24.04 picks webkit2gtk-driver 2.52.6, 26.04 picks webkitgtk-webdriver
2.52.0, and every other package in the step has a 26.04 candidate.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_019jHjgRysB6GajV3oDppruf

This branch has not been deployed

No deployments
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

no-changelog Exempt from the release changelog coverage check

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants