diff --git a/.github/workflows/conventions.yml b/.github/workflows/conventions.yml index 5316214..b3d5135 100644 --- a/.github/workflows/conventions.yml +++ b/.github/workflows/conventions.yml @@ -5,4 +5,4 @@ on: pull_request: jobs: conventions: - uses: robertblust/conventions/.github/workflows/check.yml@v1.3.2 + uses: robertblust/conventions/.github/workflows/check.yml@v1.4.0 diff --git a/AGENTS.md b/AGENTS.md index ec2e484..d69df72 100644 --- a/AGENTS.md +++ b/AGENTS.md @@ -1,4 +1,4 @@ - + Shared conventions of the robertblust, guestgraph and companygraph organizations live in `conventions/`, vendored from robertblust/conventions at the release `conventions.json` names. Read them before writing or committing anything here. diff --git a/conventions.json b/conventions.json index 926ed73..1c223d4 100644 --- a/conventions.json +++ b/conventions.json @@ -1 +1 @@ -{ "repo": "robertblust/conventions", "tag": "v1.3.2" } +{ "repo": "robertblust/conventions", "tag": "v1.4.0" } diff --git a/conventions/AGENTS.md b/conventions/AGENTS.md index e0150c9..911bdf8 100644 --- a/conventions/AGENTS.md +++ b/conventions/AGENTS.md @@ -1,4 +1,4 @@ - + Shared conventions of the robertblust, guestgraph and companygraph organizations live in `conventions/`, vendored from robertblust/conventions at the release `conventions.json` names. Read them before writing or committing anything here. diff --git a/conventions/WORKING.md b/conventions/WORKING.md index 7f27f12..f3e0744 100644 --- a/conventions/WORKING.md +++ b/conventions/WORKING.md @@ -40,9 +40,11 @@ and the merge commit carries that address to the default branch unchanged. That rule, and it holds for a contributor from outside exactly as it holds for the owner; nothing here asks a contributor to be anyone but themselves. -Nothing on GitHub enforces an address, and nothing should: the ruleset rule that could, an -author-email pattern, would shut out every outside contributor. So each person's identity is -their own `git config` to keep. The owner's is `robert.blust@flatland.ch` in all three +Nothing on GitHub enforces an address, and nothing should. The ruleset rule that could, +`commit_author_email_pattern`, is not available on this plan — a ruleset carrying it is +rejected while an otherwise identical one carrying a `deletion` rule is accepted, tested rather +than assumed — and it would shut out every outside contributor if it were. So each person's +identity is their own `git config` to keep. The owner's is `robert.blust@flatland.ch` in all three organizations, keyed by `includeIf` blocks in `~/.gitconfig` to the directories `~/git/robertblust/`, `~/git/guestgraph/` and `~/git/companygraph/`; a clone made anywhere else takes the global default and gives no warning. Before the first commit in a fresh clone, diff --git a/conventions/conventions-check b/conventions/conventions-check index 3b725a5..14c0809 100755 --- a/conventions/conventions-check +++ b/conventions/conventions-check @@ -21,7 +21,7 @@ PIN=$ROOT/conventions.json # way but on the letter that follows, since British and American diverge right there. Case is # folded by lowering the line before matching, not by the pattern, since IGNORECASE is a GNU # extension awk on macOS does not have. -STEMS='organis(e|a|i)|colour|behaviour|centre|licence|recognis|modelling|catalogue|grey([^a-z]|$)|judgement|artefact|whilst|amongst|favour|honour|analys(e|ed|ing)([^a-z]|$)|optimis(e|a|i)|normalis|serialis|initialis(e|a|i)|visualis|minimis(e|a|i)|prioritis|customis|summaris|categoris|parameteris|rasteris|unrecognis|cancelled|travelled|labelled|aluminium|instalment|neighbour|totalled|defence|offence|programmes?([^a-z]|$)|fulfil([^a-z]|$)|enrol([^a-z]|$)|skilful|ageing|cosy([^a-z]|$)|focuss|cheque([^a-z]|$)|tyre([^a-z]|$)|kerb([^a-z]|$)|storey|mould|plough|draught|sceptic' +STEMS='organis(e|a|i)|colour|behaviour|centre|licence|recognis|modelling|catalogue|grey([^a-z]|$)|judgement|artefact|whilst|amongst|favour|honour|analys(e|ed|ing)([^a-z]|$)|optimis(e|a|i)|normalis|serialis|initialis(e|a|i)|visualis|minimis(e|a|i)|prioritis|customis|summaris|categoris|parameteris|rasteris|unrecognis|cancelled|travelled|labelled|aluminium|instalment|neighbour|totalled|defence|offence|programmes?([^a-z]|$)|fulfil([^a-z]|$)|enrol([^a-z]|$)|skilful|ageing|cosy([^a-z]|$)|focuss|cheque([^a-z]|$)|tyre([^a-z]|$)|kerb([^a-z]|$)|storey|mould|plough|draught|sceptic|generalis(e|ed|es|ing|ation|ations)|specialis(e|ed|es|ing|ation)|realis(e|ed|es|ing|ation)|materialis(e|ed|es|ing|ation)|penalis(e|ed|es|ing|ation)|singularis(e|ed|es|ing|ation)|authoris(e|ed|es|ing|ation)|emphasis(e|ed|es|ing)|criticis(e|ed|es|ing)|capitalis(e|ed|es|ing|ation)|formalis(e|ed|es|ing|ation)|finalis(e|ed|es|ing|ation)|stabilis(e|ed|es|ing|ation)|utilis(e|ed|es|ing|ation)|harmonis(e|ed|es|ing|ation)|standardis(e|ed|es|ing|ation)|synchronis(e|ed|es|ing|ation)|mobilis(e|ed|es|ing|ation)|memoris(e|ed|es|ing|ation)|apologis(e|ed|es|ing)|synthesis(e|ed|es|ing)|hypothesis(e|ed|es|ing)|paralys(e|ed|es|ing)|catalys(e|ed|es|ing)|modelled|modeller|flavour|harbour|labour|rumour|humour|vigour|rigour|armour|endeavour|savour|odour|valour|metre([^a-z]|$)|metres|litre|fibre|theatre|calibre|travelling|signalling|cancelling|fuelled|levelled|channelled|counsellor|marvellous|jewellery' DASH='[^ ]—|—[^ ]' # The exclude list: every quoted string inside the "exclude": [ ... ] array, one per line, so diff --git a/conventions/manifest.json b/conventions/manifest.json index 70528c3..4869be1 100644 --- a/conventions/manifest.json +++ b/conventions/manifest.json @@ -1,12 +1,12 @@ { "repo": "robertblust/conventions", - "tag": "v1.3.2", + "tag": "v1.4.0", "files": { "conventions/WRITING.md": "sha256:b490bc45be749d431aa32ecb9acc070111de95fe244764b4546da1eb8745296c", - "conventions/WORKING.md": "sha256:b3aecf1cb82608a72004e1e2e10324a78df991ec147678d4bd04a66ec5b9ad46", + "conventions/WORKING.md": "sha256:b78601d72afce4ecd01d9385452bb3e5422fbd1f3b2991efb7a56b069a1700f7", "conventions/REPOSITORIES.md": "sha256:b85d4a80144d46b432ee569eacee79644275f146d186c2cec2990b0a3e7be58f", - "conventions/AGENTS.md": "sha256:315c5a7802004aa0a67ee429c918e62ba94d053c1c935ed9ee865a4f560c2379", + "conventions/AGENTS.md": "sha256:2cc3012c1834f103bebff6a075a7a19b05d59d1bbdba93b766d27e77c918cf9c", "conventions/conventions-sync": "sha256:e062c0ed043ba9bd1e3246170b042c6e6665822dafd51c7ca90e19fd4ad6942a", - "conventions/conventions-check": "sha256:a620a0f3ce013884adaa68b41ee1158822791ce6f3d3b5be7e71037ff533cc3f" + "conventions/conventions-check": "sha256:af40f593bc49c90d6c306e90a8870f5874deab8bdd934a1bf1edcd5ec3efc6f9" } } diff --git a/notes/elevenlabs-clip-ends-on-a-click.md b/notes/elevenlabs-clip-ends-on-a-click.md index 89c301c..756c448 100644 --- a/notes/elevenlabs-clip-ends-on-a-click.md +++ b/notes/elevenlabs-clip-ends-on-a-click.md @@ -130,7 +130,7 @@ result was decoder-dependent and I had stated it as fact. And then a person listened to all of it, in both languages, start to finish. -## What generalises +## What generalizes **The ear is the oracle; the meter is an instrument.** Three times a measurement said the problem was solved and a listener said otherwise. Every one of those was a real