Skip to content

Commit a749064

Browse files
justin808claude
andauthored
Upgrade cpflow to 6.0.1 and drop vendored actions (#862)
* Upgrade cpflow to 6.0.1 and drop vendored actions cpflow 6.0.1 loads its composite actions from the pinned upstream ref again, so the review-app deploy and delete workflows no longer need the copies under .github/actions/cpflow-*. Move the gem and both callers to the v6.0.1 commit, delete the copies, and remove the contract check and specs that existed only to keep them in step. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> * Keep a clean-fixture baseline in the contract spec Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> --------- Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
1 parent 23cbd83 commit a749064

21 files changed

Lines changed: 45 additions & 1479 deletions

File tree

‎.controlplane/docs/testing-cpflow-github-actions.md‎

Lines changed: 13 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -33,28 +33,23 @@ helper separately when validating workflow changes.
3333

3434
## Released Review-App Pair
3535

36-
The deploy/delete callers and local CLI use cpflow **6.0.0**. Both callers pin
37-
`68b5d83152c02a70eb98ffdc7fd2072e28265fef` with a readable `v6.0.0`
36+
The deploy/delete callers and local CLI use cpflow **6.0.1**. Both callers pin
37+
`6aa575780f2d9175755881b79cbb3253adbc9c1f` with a readable `v6.0.1`
3838
comment. Other generated callers intentionally remain on their existing
3939
**5.2.0** cohort; their migration is separate scope.
4040

4141
The pair is inseparable: both need the generated authenticated redispatch
4242
input, exact run/job names, and matching permissions. A pin-only upgrade or a
4343
single divergent canary is rejected. The offline validator reads the installed
44-
6.0.0 gem's caller templates as its source of truth, without loading cpflow code.
45-
46-
From 6.0.0 the pair runs the composite actions checked in under
47-
`.github/actions/cpflow-*` instead of the copies in the upstream checkout. Keep
48-
those directories identical to the bundled gem's `.github/actions`; the contract
49-
check fails when they differ. The older cohort still loads its actions from its
50-
own pinned upstream source.
51-
52-
The released 6.0.0 workflow checks this repository out at the triggering
53-
event's own revision before it runs these actions, and checks the pull
54-
request's application code out separately under `app/`. The actions therefore
55-
carry the caller workflow's trust, not the application code's. The repository
56-
variables `REVIEW_APP_PREFIX` and `CPLN_ORG_STAGING` must stay set: they take
57-
precedence over the prefix and org in the pull request's `controlplane.yml`. The deploy caller also maps the optional
44+
6.0.1 gem's caller templates as its source of truth, without loading cpflow code.
45+
46+
Both cohorts load cpflow's composite actions from their own pinned upstream
47+
source, so this repository checks in no `.github/actions/cpflow-*` copies.
48+
cpflow 6.0.0 briefly required such copies; 6.0.1 removed that requirement.
49+
50+
The repository variables `REVIEW_APP_PREFIX` and `CPLN_ORG_STAGING` must stay
51+
set: they take precedence over the prefix and org in the pull request's
52+
`controlplane.yml`. The deploy caller also maps the optional
5853
`REVIEW_APP_DOCKER_BUILD_SECRETS` secret, which this repo does not define. A
5954
pull request's Dockerfile can read it during the build, so only ever store
6055
review-grade values there.
@@ -65,8 +60,8 @@ a release-tag ref and cannot be combined with a commit SHA.
6560

6661
Do not run the all-wrapper pin helper or blindly regenerate over the customized
6762
validation script for this split migration. A future upgrade must update both
68-
callers, the local dependency/lockfile, the checked-in local actions, validator
69-
release constants, and fixture tests together. Preserve the renderer assertions
63+
callers, the local dependency/lockfile, validator release constants, and fixture
64+
tests together. Preserve the renderer assertions
7065
and separately review any changes to other caller cohorts.
7166

7267
## Review App Canary

‎.controlplane/readme.md‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ _If you need a free demo account for Control Plane (no CC required), you can con
66

77
---
88

9-
Check [how the `cpflow` gem is used in the generated GitHub Actions flow](https://github.com/shakacode/react-webpack-rails-tutorial/blob/master/.github/actions/cpflow-build-docker-image/action.yml).
9+
Check [how the `cpflow` gem is used in the generated GitHub Actions flow](https://github.com/shakacode/control-plane-flow/blob/v6.0.1/.github/actions/cpflow-build-docker-image/action.yml).
1010
Here is a brief [video overview](https://www.youtube.com/watch?v=llaQoAV_6Iw).
1111

1212
---
@@ -638,11 +638,9 @@ Keep the reusable-workflow mechanics in the upstream
638638
[`control-plane-flow` CI automation guide](https://github.com/shakacode/control-plane-flow/blob/v5.2.0/docs/ci-automation.md).
639639
This repo deliberately keeps two release cohorts:
640640

641-
- The review-app deploy/delete callers pin cpflow `v6.0.0` at
642-
`68b5d83152c02a70eb98ffdc7fd2072e28265fef`. The bundled `cpflow` gem and
643-
lockfile use `6.0.0`. From 6.0.0 these workflows run the composite actions
644-
checked in under `.github/actions/cpflow-*`, so those files must match the
645-
bundled gem.
641+
- The review-app deploy/delete callers pin cpflow `v6.0.1` at
642+
`6aa575780f2d9175755881b79cbb3253adbc9c1f`. The bundled `cpflow` gem and
643+
lockfile use `6.0.1`.
646644
- Staging, cleanup, help, and promotion retain `v5.2.0` at
647645
`1d1ec7f7af181c5c6cf07f512ce336dbdb367246`. Their migration is separate
648646
scope, not an automatic consequence of updating the local gem.

‎.controlplane/shakacode-team.md‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -142,10 +142,8 @@ filter in `.github/workflows/cpflow-deploy-staging.yml`.
142142
Keep upstream workflow and action references on reviewed, immutable full commit
143143
SHAs with readable release comments, not release tags, `main`, or feature
144144
branches. The review-app deploy/delete pair advances together on released
145-
**6.0.0**; other generated callers and promotion actions retain their reviewed
146-
**5.2.0** cohort until a separately scoped migration. From 6.0.0 the pair runs
147-
the composite actions checked in under `.github/actions/cpflow-*`; keep them
148-
identical to the bundled gem.
145+
**6.0.1**; other generated callers and promotion actions retain their reviewed
146+
**5.2.0** cohort until a separately scoped migration.
149147

150148
Do not blanket-regenerate the automation or use the all-wrapper pin helper for
151149
this split migration. Preserve the customized validator and renderer assertions,

‎.github/actions/cpflow-build-docker-image/action.yml‎

Lines changed: 0 additions & 262 deletions
This file was deleted.

‎.github/actions/cpflow-delete-control-plane-app/action.yml‎

Lines changed: 0 additions & 30 deletions
This file was deleted.

0 commit comments

Comments
 (0)