Skip to content

Commit

Permalink
internal/ci: rename and clarify the e2e logins.json secret
Browse files Browse the repository at this point in the history
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]>
  • Loading branch information
mvdan committed Oct 1, 2024
1 parent 186763c commit 992127e
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/trybot.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,7 @@ jobs:
uses: google-github-actions/setup-gcloud@v2
- name: End-to-end test
env:
CUE_TEST_LOGINS: ${{ secrets.E2E_CUE_LOGINS }}
CUE_TEST_LOGINS: ${{ secrets.E2E_PORCUEPINE_CUE_LOGINS }}
if: |-
github.repository == 'cue-lang/cue' && (((github.ref == 'refs/heads/master' || startsWith(github.ref, 'refs/heads/release-branch.')) && (! (contains(github.event.head_commit.message, '
Dispatch-Trailer: {"type":"')))) || (github.ref == 'refs/heads/ci/test')) && (matrix.go-version == '1.23.x' && matrix.runner == 'ubuntu-22.04')
Expand Down
10 changes: 5 additions & 5 deletions internal/ci/github/trybot.cue
Original file line number Diff line number Diff line change
Expand Up @@ -153,12 +153,12 @@ workflows: trybot: _repo.bashWorkflow & {
},
{
name: "End-to-end test"
// The secret is the fine-grained access token "cue-lang/cue ci e2e for modules-testing"
// owned by the porcuepine bot account with read+write access to repo administration and code
// on the entire cue-labs-modules-testing org. Note that porcuepine is also an org admin,
// since otherwise the repo admin access to create and delete repos does not work.
env: {
CUE_TEST_LOGINS: "${{ secrets.E2E_CUE_LOGINS }}"
// E2E_PORCUEPINE_CUE_LOGINS is the logins.json resulting from doing a `cue login`
// with registry.cue.works as the GitHub porcuepine user.
// TODO(mvdan): remove the E2E_CUE_LOGINS secret once all uses are gone,
// i.e. once the release branch for v0.10 is deleted.
CUE_TEST_LOGINS: "${{ secrets.E2E_PORCUEPINE_CUE_LOGINS }}"
}
// Our regular tests run with both `go test ./...` and `go test -race ./...`.
// The end-to-end tests should only be run once, given the slowness and API rate limits.
Expand Down

0 comments on commit 992127e

Please sign in to comment.