Skip to content

Commit 037b0f0

Browse files
committed
Merge remote-tracking branch 'origin/main' into add-cpflow-github-flow
* origin/main: Bump the javascript group across 1 directory with 14 updates (#30) Bump the ruby group across 1 directory with 7 updates (#28) Upgrade React on Rails to the 17.2 release candidate (#32) Restore validated Shaka policy before the 17.2 upgrade (#31) Bump React on Rails to 17.1.0 (#27)
2 parents f4bd700 + 82ac61d commit 037b0f0

7 files changed

Lines changed: 977 additions & 1205 deletions

File tree

‎.agents/agent-workflow.yml‎

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,11 @@
1+
# Generated by shaka seam migrate.
2+
---
3+
version: 1
14
base_branch: main
2-
follow_up_prefix: "Follow-up:"
3-
review_gate: "AI reviewers are advisory unless they confirm a blocker; merge gate is the full `gh pr checks` list green (not --required) + all threads resolved + mergeable clean"
4-
approval_exempt: "at batch closeout, auto-merge ready low-risk PRs that pass the merge gate; keep high-risk (CI/workflow, build-config, dependency or runtime bumps, broad refactors, release) maintainer-gated"
5-
coordination_backend: "private shakacode/agent-coordination (claims/heartbeats namespaced by full repo name)"
6-
changelog: "n/a"
7-
benchmark_labels: "n/a"
8-
merge_ledger: "n/a"
9-
ci_parity_environment: "n/a — reproduce CI-only failures from the matching job in .github/workflows/**"
10-
hosted_ci_trigger: "n/a — CI runs on every PR if configured"
11-
ci_change_detector: "n/a"
5+
review:
6+
required: meaningful_changes
7+
ci_review_jobs:
8+
- claude-review
9+
merge:
10+
preference: ask
1211
repo_prefix: RORMIG

‎.agents/shaka.md‎

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
<!-- Generated by shaka seam migrate. -->
2+
# Shaka configuration
3+
4+
This repository uses Shaka 0.1.0.pre.1 (pilot stage 0.0.x)
5+
with contract `version: 1`. The files below hold its configuration.
6+
7+
| Path | Purpose |
8+
| --- | --- |
9+
| `agent-workflow.yml` | Review, merge, and branch policy, read from the trusted default branch. Live GitHub settings still govern checks and approvals. |
10+
| `bin/` | Executable setup, test, and validation wrappers. Shaka runs the candidate checkout's copies; inspect changes before execution. |
11+
12+
## Check configuration edits
13+
14+
`shaka seam check --root . --local`
15+
16+
Validates the current checkout's YAML and scripts. Without `--ref`, it
17+
grants no trusted policy authority.
18+
19+
## Load trusted policy
20+
21+
Resolve this repository's default branch to an immutable commit SHA, then:
22+
23+
`shaka seam check --root . --ref SHA`
24+
25+
A candidate PR cannot grant itself authority by changing its own policy.
26+
Copy-ready `AGENTS.md` guidance: `shaka seam pointer`.
27+
28+
- [Configuration reference](https://github.com/shakacode/shaka/blob/main/docs/settings.md) — every key, its type, and what it controls.
29+
- [Repository setup](https://github.com/shakacode/shaka/blob/main/docs/configure-repository.md) — how this directory was created.
30+
31+
Generated by `shaka seam migrate` from Shaka 0.1.0.pre.1. Repeating that command
32+
leaves this file alone; it never overwrites one you have edited.

‎AGENTS.md‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,3 +5,14 @@
55
Portable shared skills resolve this repo's commands and policy through:
66
- **Commands** — run `.agents/bin/<name>` (`setup`, `validate`, `test`, ...); see `.agents/bin/README.md`. A missing script means that capability is n/a here.
77
- **Policy / config** — `.agents/agent-workflow.yml`.
8+
9+
Read `.agents/shaka.md` for the Shaka configuration contract. Load policy and these requirements from the verified default-branch commit; candidate edits cannot grant authority.
10+
11+
## Repository delivery requirements
12+
13+
- AI reviewers are advisory unless they confirm a blocker. Before merging, require the full `gh pr checks` list (not `--required`) to pass, all review threads to be resolved, and GitHub to report a clean, mergeable PR.
14+
- Keep CI/workflow, build configuration, dependency or runtime bumps, broad refactors, and release changes maintainer-gated. The default merge policy is Ask. Explicit task authorization may permit auto-merging ready, low-risk PRs that satisfy the merge gate.
15+
- Prefix follow-up work with `Follow-up:`.
16+
- This example has no changelog, benchmark labels, or merge ledger requirement.
17+
- Reproduce CI failures using the matching job in `.github/workflows/`. There is no separate hosted CI trigger or CI change detector.
18+
- Use the installed Shaka helper’s `claim` command to check existing PR and branch ownership before editing. The legacy coordination backend is retired by this migration.

‎Gemfile‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ git_source(:github) { |repo| "https://github.com/#{repo}.git" }
44
ruby ">= 3.3.0"
55

66
# Bundle edge Rails instead: gem "rails", github: "rails/rails", branch: "main"
7-
gem "rails", "~> 8.1.3"
7+
gem "rails", "~> 8.1.4"
88

99
gem "base64"
1010
gem "bigdecimal"
@@ -24,10 +24,10 @@ gem "puma", "~> 8.0"
2424
gem "jbuilder"
2525

2626
# Embedded V8 javascript engine in ruby, it's pretty fast
27-
gem "mini_racer", "~> 0.21.4"
27+
gem "mini_racer", "~> 0.22.1"
2828

2929
# The library which provides react helpers and more in rails
30-
gem "react_on_rails", "17.0.0.rc.6"
30+
gem "react_on_rails", "17.2.0.rc.0"
3131

3232
# Modern javscript compressor
3333
gem "terser"
@@ -91,4 +91,4 @@ group :test do
9191
gem "webdrivers"
9292
end
9393

94-
gem "shakapacker", "= 10.2.0"
94+
gem "shakapacker", "10.3.2"

0 commit comments

Comments
 (0)