Skip to content

Commit 992127e

Browse files
committed
internal/ci: rename and clarify the e2e logins.json secret
The GitHub Actions secret name E2E_CUE_LOGINS was a bit ambiguous on its own; it belongs to the porcuepine user, but that wasn't clear from its name. We named other secrets after the bot user in question, such as CUECKOO_GERRITHUB_PASSWORD and PORCUEPINE_GITHUB_PAT, so do the same here. We still carried a doc comment about the now-deleted E2E_GITHUB_TOKEN, so that can be deleted now. Document the logins.json secret instead. E2E_PORCUEPINE_CUE_LOGINS has already been created as an actions secret in the cue-lang/cue repository ahead of this change. E2E_CUE_LOGINS will be deleted in the near future; leave myself a TODO. Signed-off-by: Daniel Martí <[email protected]> Change-Id: I0078f0bb00bad2165d9a7085aba37b46601fa31d Reviewed-on: https://review.gerrithub.io/c/cue-lang/cue/+/1202040 TryBot-Result: CUEcueckoo <[email protected]> Reviewed-by: Roger Peppe <[email protected]> Unity-Result: CUE porcuepine <[email protected]>
1 parent 186763c commit 992127e

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

.github/workflows/trybot.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@ jobs:
137137
uses: google-github-actions/setup-gcloud@v2
138138
- name: End-to-end test
139139
env:
140-
CUE_TEST_LOGINS: ${{ secrets.E2E_CUE_LOGINS }}
140+
CUE_TEST_LOGINS: ${{ secrets.E2E_PORCUEPINE_CUE_LOGINS }}
141141
if: |-
142142
github.repository == 'cue-lang/cue' && (((github.ref == 'refs/heads/master' || startsWith(github.ref, 'refs/heads/release-branch.')) && (! (contains(github.event.head_commit.message, '
143143
Dispatch-Trailer: {"type":"')))) || (github.ref == 'refs/heads/ci/test')) && (matrix.go-version == '1.23.x' && matrix.runner == 'ubuntu-22.04')

internal/ci/github/trybot.cue

+5-5
Original file line numberDiff line numberDiff line change
@@ -153,12 +153,12 @@ workflows: trybot: _repo.bashWorkflow & {
153153
},
154154
{
155155
name: "End-to-end test"
156-
// The secret is the fine-grained access token "cue-lang/cue ci e2e for modules-testing"
157-
// owned by the porcuepine bot account with read+write access to repo administration and code
158-
// on the entire cue-labs-modules-testing org. Note that porcuepine is also an org admin,
159-
// since otherwise the repo admin access to create and delete repos does not work.
160156
env: {
161-
CUE_TEST_LOGINS: "${{ secrets.E2E_CUE_LOGINS }}"
157+
// E2E_PORCUEPINE_CUE_LOGINS is the logins.json resulting from doing a `cue login`
158+
// with registry.cue.works as the GitHub porcuepine user.
159+
// TODO(mvdan): remove the E2E_CUE_LOGINS secret once all uses are gone,
160+
// i.e. once the release branch for v0.10 is deleted.
161+
CUE_TEST_LOGINS: "${{ secrets.E2E_PORCUEPINE_CUE_LOGINS }}"
162162
}
163163
// Our regular tests run with both `go test ./...` and `go test -race ./...`.
164164
// The end-to-end tests should only be run once, given the slowness and API rate limits.

0 commit comments

Comments
 (0)