Skip to content

Commit 49879e9

Browse files
committed
Pin cpflow workflows to runner wait fix
1 parent 0c7afed commit 49879e9

10 files changed

Lines changed: 22 additions & 20 deletions

.controlplane/readme.md

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -577,9 +577,10 @@ For this repo, the update loop is:
577577
1. Generate from the desired `cpflow` release with `--staging-branch master`.
578578
2. Keep generated refs on a release tag once the upstream hardening changes ship.
579579
This branch temporarily pins refs to
580-
`2d8225572edd6f54c83ba9c51bd2983546989e93` to test upstream promotion
581-
hardening before the next release tag. Leave `CPFLOW_VERSION` unset while
582-
testing a commit SHA.
580+
`d8877ca0c9c1d88947f322903e4a4344641029ba` to use merged-but-unreleased
581+
upstream promotion hardening and the release-runner timeout fix before the
582+
next release tag.
583+
Leave `CPFLOW_VERSION` unset while testing a commit SHA.
583584
3. Keep app names and GitHub settings aligned with `.controlplane/controlplane.yml`.
584585
4. Validate locally:
585586

.controlplane/shakacode-team.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -118,11 +118,11 @@ Advanced optional settings are documented upstream in the
118118
[`control-plane-flow` CI automation guide](https://github.com/shakacode/control-plane-flow/blob/main/docs/ci-automation.md).
119119

120120
Current workflow wrappers are temporarily pinned to upstream
121-
`control-plane-flow` commit `2d8225572edd6f54c83ba9c51bd2983546989e93` to test
122-
promotion hardening before it ships in a release tag. Keep release tags as the
123-
steady-state configuration once the upstream PR is released; use a full commit
124-
SHA only for short-lived upstream PR testing and leave `CPFLOW_VERSION` unset in
125-
that case.
121+
`control-plane-flow` commit `d8877ca0c9c1d88947f322903e4a4344641029ba` to use
122+
merged-but-unreleased promotion hardening and the release-runner timeout fix
123+
before they ship in a release tag. Keep release tags as the steady-state
124+
configuration once the upstream changes are released; use a full commit SHA only
125+
for short-lived upstream testing and leave `CPFLOW_VERSION` unset in that case.
126126

127127
If staging moves off `master`, update both `STAGING_APP_BRANCH` and the branch
128128
filter in `.github/workflows/cpflow-deploy-staging.yml`.

.github/cpflow-help.md

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
These commands are generated by [cpflow](https://github.com/shakacode/control-plane-flow).
44
For full setup, version-pinning, and troubleshooting details, see the upstream
5-
[CI automation guide](https://github.com/shakacode/control-plane-flow/blob/2d8225572edd6f54c83ba9c51bd2983546989e93/docs/ci-automation.md).
5+
[CI automation guide](https://github.com/shakacode/control-plane-flow/blob/d8877ca0c9c1d88947f322903e4a4344641029ba/docs/ci-automation.md).
66

77
## Pull Request Commands
88

@@ -112,9 +112,10 @@ production org, using production-only secrets and values.
112112

113113
Generated wrappers normally pin Control Plane Flow with a release tag, for
114114
example `v5.1.0`. This branch temporarily pins the wrappers to upstream commit
115-
`2d8225572edd6f54c83ba9c51bd2983546989e93` while testing
116-
merged-but-unreleased production promotion hardening. Reusable review-app,
117-
staging, cleanup, and helper workflows pin that ref in their `uses:` entry.
115+
`d8877ca0c9c1d88947f322903e4a4344641029ba` while using merged-but-unreleased
116+
production promotion hardening plus the release-runner timeout fix. Reusable
117+
review-app, staging, cleanup, and helper workflows pin that ref in their
118+
`uses:` entry.
118119
Production promotion pins the same ref in its control-plane-flow checkout step
119120
so the caller-owned job can keep `environment: production` and receive
120121
production environment secrets directly.

.github/workflows/cpflow-cleanup-stale-review-apps.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,6 @@ jobs:
1212
cleanup:
1313
# Cleanup targets the current inferred review-app prefix. If you changed
1414
# naming conventions, manually delete review apps under the old prefix.
15-
uses: shakacode/control-plane-flow/.github/workflows/cpflow-cleanup-stale-review-apps.yml@2d8225572edd6f54c83ba9c51bd2983546989e93
15+
uses: shakacode/control-plane-flow/.github/workflows/cpflow-cleanup-stale-review-apps.yml@d8877ca0c9c1d88947f322903e4a4344641029ba
1616
secrets:
1717
CPLN_TOKEN_STAGING: ${{ secrets.CPLN_TOKEN_STAGING }}

.github/workflows/cpflow-delete-review-app.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,6 @@ jobs:
3131
github.event_name == 'workflow_dispatch'
3232
# This `if:` mirrors the upstream job guard to avoid a billable workflow_call
3333
# when the event does not match. Keep both conditions in sync.
34-
uses: shakacode/control-plane-flow/.github/workflows/cpflow-delete-review-app.yml@2d8225572edd6f54c83ba9c51bd2983546989e93
34+
uses: shakacode/control-plane-flow/.github/workflows/cpflow-delete-review-app.yml@d8877ca0c9c1d88947f322903e4a4344641029ba
3535
secrets:
3636
CPLN_TOKEN_STAGING: ${{ secrets.CPLN_TOKEN_STAGING }}

.github/workflows/cpflow-deploy-review-app.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ jobs:
3030
github.event.issue.pull_request &&
3131
contains(fromJson('["+review-app-deploy","+review-app-deploy\n","+review-app-deploy\r\n"]'), github.event.comment.body) &&
3232
contains(fromJson('["OWNER","MEMBER","COLLABORATOR"]'), github.event.comment.author_association))
33-
uses: shakacode/control-plane-flow/.github/workflows/cpflow-deploy-review-app.yml@2d8225572edd6f54c83ba9c51bd2983546989e93
33+
uses: shakacode/control-plane-flow/.github/workflows/cpflow-deploy-review-app.yml@d8877ca0c9c1d88947f322903e4a4344641029ba
3434
secrets:
3535
CPLN_TOKEN_STAGING: ${{ secrets.CPLN_TOKEN_STAGING }}
3636
DOCKER_BUILD_SSH_KEY: ${{ secrets.DOCKER_BUILD_SSH_KEY }}

.github/workflows/cpflow-deploy-staging.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ permissions:
1616

1717
jobs:
1818
deploy-staging:
19-
uses: shakacode/control-plane-flow/.github/workflows/cpflow-deploy-staging.yml@2d8225572edd6f54c83ba9c51bd2983546989e93
19+
uses: shakacode/control-plane-flow/.github/workflows/cpflow-deploy-staging.yml@d8877ca0c9c1d88947f322903e4a4344641029ba
2020
with:
2121
staging_app_branch_default: "master"
2222
secrets:

.github/workflows/cpflow-help-command.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,4 +23,4 @@ jobs:
2323
contains(fromJson('["+review-app-help","+review-app-help\n","+review-app-help\r\n"]'), github.event.comment.body) &&
2424
contains(fromJson('["OWNER","MEMBER","COLLABORATOR"]'), github.event.comment.author_association)) ||
2525
github.event_name == 'workflow_dispatch'
26-
uses: shakacode/control-plane-flow/.github/workflows/cpflow-help-command.yml@2d8225572edd6f54c83ba9c51bd2983546989e93
26+
uses: shakacode/control-plane-flow/.github/workflows/cpflow-help-command.yml@d8877ca0c9c1d88947f322903e4a4344641029ba

.github/workflows/cpflow-promote-staging-to-production.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ jobs:
6969
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd
7070
with:
7171
repository: shakacode/control-plane-flow
72-
ref: 2d8225572edd6f54c83ba9c51bd2983546989e93
72+
ref: d8877ca0c9c1d88947f322903e4a4344641029ba
7373
path: .cpflow
7474
persist-credentials: false
7575

@@ -179,7 +179,7 @@ jobs:
179179
cpln_cli_version: ${{ vars.CPLN_CLI_VERSION }}
180180
cpflow_version: ${{ vars.CPFLOW_VERSION }}
181181
# The setup action validates CPFLOW_VERSION against this full workflow ref.
182-
control_plane_flow_ref: shakacode/control-plane-flow/.github/workflows/cpflow-promote-staging-to-production.yml@2d8225572edd6f54c83ba9c51bd2983546989e93
182+
control_plane_flow_ref: shakacode/control-plane-flow/.github/workflows/cpflow-promote-staging-to-production.yml@d8877ca0c9c1d88947f322903e4a4344641029ba
183183

184184
# Runs after Setup production environment so the pinned Ruby (>= 3.1) is on PATH.
185185
# YAML.load_file(..., aliases: true) is not supported on Ruby 3.0 (system Ruby on ubuntu-22.04).

.github/workflows/cpflow-review-app-help.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,4 +18,4 @@ jobs:
1818
# to PR-open help. Remove it, or uncomment and adapt this guard, if forks or
1919
# clones should stay quiet until Control Plane is configured:
2020
# if: vars.REVIEW_APP_PREFIX != '' || vars.CPLN_ORG_STAGING != ''
21-
uses: shakacode/control-plane-flow/.github/workflows/cpflow-review-app-help.yml@2d8225572edd6f54c83ba9c51bd2983546989e93
21+
uses: shakacode/control-plane-flow/.github/workflows/cpflow-review-app-help.yml@d8877ca0c9c1d88947f322903e4a4344641029ba

0 commit comments

Comments
 (0)