Skip to content

Merge main into dev_rhf - #218

Merged
ehrlinger merged 4 commits into
dev_rhffrom
merge/main-into-dev_rhf-11
Aug 21, 2026
Merged

Merge main into dev_rhf#218
ehrlinger merged 4 commits into
dev_rhffrom
merge/main-into-dev_rhf-11

Conversation

@ehrlinger

Copy link
Copy Markdown
Owner

Eleventh forward-merge. Two files, no conflicts: #217 moves the house-style gate out of its own workflow into lint.yaml, carrying the job-level permissions: contents: read that keeps it as narrow as it was standalone.

⚠️ Merge with a merge commit, not a squash (two parents, per the standing rule for this branch).

Verified the auto-merge rather than trusting it

lint.yaml is the one file both branches have edited, and dev_rhf carries a trigger main does not:

value after merge correct?
push: branches [main, dev] yes, dev_rhf's own, preserved
pull_request all PRs, no filter yes, from #213
job house-style permissions {contents: read} yes, from #217
job lint permissions inherits read-all unchanged, as on main
house-style.yaml deleted yes, as on main

One inherited behaviour change worth naming

The house-style check now runs on pushes to dev as well. The standalone workflow was push: branches: [main] only; folding it into lint.yaml gives it that file's branches, which on this branch include dev.

It is a cheap job, and this is the branch most likely to drift from the composed artifact, so the wider trigger is the right side of the trade. Flagging it because it was a side effect of the move rather than an explicit decision in #217, and it only becomes visible here.

Gate

  • check-workflow-order.py — 8 files, setup-r ordering OK
  • lintr::lint_package()0 lints
  • devtools::test()FAIL 0 | PASS 1567 | SKIP 6
  • vdiffr baselines stable at 52, zero untracked

🤖 Generated with Claude Code

ehrlinger and others added 4 commits August 21, 2026 11:21
…dard

This repo diverged from a standard its own composed artifact carries:

  "Put it in `lint.yaml` rather than a sixth workflow. It needs the same R
   setup lint already does, it takes seconds, and `lint.yaml` has become this
   portfolio's fast-pull-request-checks file -- hvtiPlotR already runs the
   house-style drift check there. Adding a whole workflow for a two-line job
   would inflate the count the "name the question" rule exists to hold down."

ggRandomForests ran the check from a standalone house-style.yaml. The job moves
into lint.yaml verbatim -- same pinned house-style-v1 composer, same registry
rewrite, same `--check --repo ggRandomForests` -- and the standalone workflow is
removed, taking the workflow count from 8 to 7. Triggers are unchanged: both
files already ran on push to main and on pull_request.

hvtiPlotR and temporal_hazard now both run it from lint.yaml. hvti_graphics
keeps a standalone workflow because it is a Quarto book with no lint.yaml to
host the job, which is the case the standard's "rather than a sixth workflow"
reasoning does not reach.

Verified: actionlint clean; this repo's own check-workflow-order.py passes over
all 8 workflow files (the moved job runs setup-r before its R-dependent steps);
lint.yaml parses with jobs [lint, house-style]; and a simulated CI run --
repos.yml repointed at this branch's checkout, then
`--check --repo ggRandomForests` -- exits 0.

Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
Addresses Copilot's review on #217. As a standalone workflow the house-style
gate declared `permissions: contents: read`. Moved into lint.yaml it inherited
that file's workflow-level `read-all`, which is a quiet widening: read-all
grants read on every scope, not just contents.

The job checks out two repositories and runs an R script, so contents: read is
what it needs. It also executes a script from another repository, which is the
case where keeping the token narrow is worth the two lines.

Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
ci: move the house-style gate into lint.yaml
Eleventh forward-merge. Two files, no conflicts: #217 moves the house-style
gate out of its own workflow and into lint.yaml, with the job-level
`permissions: contents: read` that keeps it as narrow as it was standalone.

Checked the auto-merge on lint.yaml rather than trusting it, since this branch
carries a trigger main does not: `push: branches: [main, dev]` is preserved,
and both of #217's changes are in. house-style.yaml is deleted here too.

One inherited behaviour change worth naming: the house-style check now runs on
pushes to `dev` as well. The standalone workflow was `push: branches: [main]`
only, and folding it into lint.yaml gives it lint.yaml's branches. It is a
cheap job and this branch is the one that would drift, so the wider trigger is
the right side of the trade, but it was not an explicit decision in #217.

Gate: 0 lints, FAIL 0 / PASS 1567 / SKIP 6, snapshots stable at 52 with zero
untracked, workflow-order OK across 8 files.

Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
Copilot AI lite review requested due to automatic review settings August 21, 2026 16:11
@codecov

codecov Bot commented Aug 21, 2026

Copy link
Copy Markdown

Codecov Report

✅ All modified and coverable lines are covered by tests.
✅ Project coverage is 89.14%. Comparing base (092f2aa) to head (88643f4).
⚠️ Report is 1 commits behind head on dev_rhf.

Additional details and impacted files

Impacted file tree graph

@@           Coverage Diff            @@
##           dev_rhf     #218   +/-   ##
========================================
  Coverage    89.14%   89.14%           
========================================
  Files           54       54           
  Lines         4770     4770           
========================================
  Hits          4252     4252           
  Misses         518      518           
🚀 New features to boost your workflow:
  • ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.

Copilot AI left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pull request overview

Consolidates house-style CI verification into lint.yaml and removes the standalone workflow.

Changes:

  • Adds the house-style job with read-only permissions.
  • Preserves verification behavior.
  • Deletes the redundant workflow.

Reviewed changes

Copilot reviewed 2 out of 2 changed files in this pull request and generated no comments.

File Summary
.github/workflows/lint.yaml Hosts the relocated house-style verification job.
.github/workflows/house-style.yaml Removed redundant standalone workflow.

💡 Add a code-review agent skill or configure MCP servers for context-aware, tailored reviews. Learn more in the docs.

@ehrlinger
ehrlinger merged commit 6b8cba4 into dev_rhf Aug 21, 2026
12 checks passed
@ehrlinger
ehrlinger deleted the merge/main-into-dev_rhf-11 branch August 21, 2026 16:29
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants