Skip to content

Review plan for the open PRs #68

Open

Description

@lgnap

I sent twelve PRs in one day last week, on top of two already open. That is a lot to face at once, and none of them say where to start — so here is a plan. Every branch is on the current master (#54 and #55 are one merge behind, but apply cleanly), none is stacked on another, and I checked each pair with git merge-tree: only four pairs conflict, all noted below. After each merge I will rebase whatever it touches within the day, without being asked.

Ordered smallest and safest first. Merge in any order you like within a tier.

Tier 1 — small, independent, no overlap with anything else

PR Size What
#64 +9/−12 Gson 2.8.5 → 2.14.0, deprecated JsonParser instances gone
#62 +33 Dependabot config for Maven, npm and the workflow actions
#61 +82/−17 Firmware version of a v6/v7 .md read as the string it is
#56 +167/−15 Driver and agent file streams closed on the exception path
#57 +209/−6 Bounded GitHub requests in EvergreenService
#55 +244/−1 Loopback answered under every one of its names

Tier 2 — tests and tooling

PR Size What
#65 +328 Round trip for the FS format
#66 +134 JaCoCo, CONTRIBUTING.md, the agent module's status

#66 conflicts with #59 on README.md; I'd rather rebase #59 (docs, no hurry) than the other way round.

Tier 3 — frontend, one file in common

#58, #63 and #60 all edit PackLibrary.js and conflict pairwise. Proposed order, each rebased on the previous once merged:

  1. Sanitize every HTML sink of the frontend, starting with the announce fetched from GitHub #58 — sanitize every HTML sink, starting with the announce fetched from GitHub (the security one, +149/−12)
  2. Keep the frontend up when storage, a dropped payload or an uploaded archive misbehaves #63 — keep the frontend up when storage, a dropped payload or an uploaded archive misbehaves (+296/−25)
  3. Keep several versions of a story in the library, and send the current one to the device #60 — several versions of a story in the library (+395/−8; the largest feature, and the one I'd most like your opinion on before it lands)

Tier 4 — features, independent of the above

PR Size What
#54 +758/−5 Device pack reordering reachable, and testable without a Lunii
#67 +371/−1 Import a zipped pack folder from the library upload

Tier 5 — documentation

#59, the file formats written down field by field (+374). Reads on its own; rebased after #66.

Two housekeeping notes: #65, #66 and #67 each bump the test-count row of TESTING.md from their own branch, so the merged figure will be short until the last one lands — I'll fix it on the last rebase. And if this is still too much at once, say so and I'll convert tiers 3–5 to drafts until the rest is through.

Activity

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

Metadata

Metadata

Assignees

No one assigned

    Labels

    No labels
    No labels

    Projects

    No projects

      Milestone

      No milestone

      Relationships

      None yet

      Development

      No branches or pull requests

      Issue actions