Skip to content

Commit 50968c3

Browse files
authored
Merge branch 'main' into dependabot/gradle/main/com.fasterxml.jackson.core-jackson-databind-2.22.2
2 parents a909cde + 59f8e65 commit 50968c3

7 files changed

Lines changed: 107 additions & 1 deletion

File tree

‎.github/workflows/dependabot-automerge.yml‎

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,16 +17,26 @@ jobs:
1717
with:
1818
github-token: "${{ secrets.GITHUB_TOKEN }}"
1919

20+
# GITHUB_TOKEN, deliberately: a review starts no workflow run and does not need to, so the
21+
# short-lived token is enough and the approval shows in the PR as the bot rather than as a
22+
# person. This needs `can_approve_pull_request_reviews` on the repository — no `permissions`
23+
# block can stand in for it, and without it GitHub refuses with "GitHub Actions is not
24+
# permitted to approve pull requests".
2025
- name: Approve patch and minor updates
2126
if: steps.metadata.outputs.update-type != 'version-update:semver-major'
2227
run: gh pr review --approve "$PR_URL"
2328
env:
2429
PR_URL: ${{ github.event.pull_request.html_url }}
2530
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
2631

32+
# BOT_PAT here, and not GITHUB_TOKEN: auto-merge is completed on behalf of whoever enabled
33+
# it, and a push made by GITHUB_TOKEN starts no workflow runs. Enabled with GITHUB_TOKEN the
34+
# merge lands on main silently — no CI, no CodeQL, no dependency snapshot, and
35+
# update-pr-branch never wakes to rebase the remaining PRs, so the automation cuts its own
36+
# legs. A PAT is a real user, so the push behaves like any other.
2737
- name: Enable auto-merge for patch and minor updates
2838
if: steps.metadata.outputs.update-type != 'version-update:semver-major'
2939
run: gh pr merge --auto --squash "$PR_URL"
3040
env:
3141
PR_URL: ${{ github.event.pull_request.html_url }}
32-
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
42+
GH_TOKEN: ${{ secrets.BOT_PAT }}

‎docs/icon/README.md‎

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
# Icon
2+
3+
A broken method chain: one long line, then a group of shorter ones sharing a left edge, with a
4+
column guide down the right. It is the formatter's own output shape — the thing that distinguishes
5+
it is deciding *where* to break and what to line up, not laying everything out uniformly.
6+
7+
| File | Use |
8+
|---|---|
9+
| `icon.svg` | The mark. Inherits `currentColor`, so one file covers light, dark and monochrome. |
10+
| `favicon.svg` | Same geometry, guide at full strength. Below ~24px contrast is what keeps the guide visible, not shape. |
11+
| `avatar.svg` | The mark on a white rounded square, for the GitHub organisation and marketplace tiles. |
12+
| `avatar-512.png`, `avatar-128.png` | Rasterised from `avatar.svg`; GitHub organisation avatars must be raster. |
13+
14+
Regenerate the PNGs after editing the SVG:
15+
16+
```bash
17+
rsvg-convert -w 512 -h 512 docs/icon/avatar.svg -o docs/icon/avatar-512.png
18+
rsvg-convert -w 128 -h 128 docs/icon/avatar.svg -o docs/icon/avatar-128.png
19+
```
20+
21+
## What not to break
22+
23+
The mark has seven elements, which is the ceiling for 16px. Anything added has to displace
24+
something else.
25+
26+
- **The shared right edge does the work.** The first and third bars end on the same x. That
27+
implied vertical is what carries "there is a boundary" at sizes where the dashes disappear, and
28+
it costs nothing because no thin element draws it. Changing either bar's width breaks the idea
29+
silently — the icon will still look fine at 64px and mean nothing at 16px.
30+
- **The guide's rhythm must not match the bars'.** Three dashes against four bars is deliberate:
31+
mismatched rhythms read as two layers, so the boundary belongs to the format rather than to any
32+
one line. Align them and the dashes turn into decoration stuck on the bar ends.
33+
- **Check every edit at 16px first.** Every version of this mark looked fine large. The small size
34+
is the only one that rejects anything.
35+
36+
The two colours in `avatar.svg` are the only brand decision baked in here, and they are a
37+
placeholder. The white ground means that on GitHub's light theme the tile itself disappears and
38+
only the mark reads; an off-white ground keeps the tile visible if that is preferred.

‎docs/icon/avatar-128.png‎

2.6 KB
Loading

‎docs/icon/avatar-512.png‎

11.7 KB
Loading

‎docs/icon/avatar.svg‎

Lines changed: 20 additions & 0 deletions
Loading

‎docs/icon/favicon.svg‎

Lines changed: 19 additions & 0 deletions
Loading

‎docs/icon/icon.svg‎

Lines changed: 19 additions & 0 deletions
Loading

0 commit comments

Comments
 (0)