From 2461c5114848e172a6d59ead3ebd4cac7af1a88a Mon Sep 17 00:00:00 2001 From: Paul Jolly Date: Sat, 25 Mar 2023 20:43:26 +0000 Subject: [PATCH] Revert "internal/ci: rename base parameter field name" MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 584f3f07fcaa02d038195999fad0f3097a84a919. Reason for revert: automated submit went wrong and submitted CLs out of order breaking the submission of the chain. Signed-off-by: Paul Jolly Change-Id: I9a40256c39aba1b9d7c33dbdb7498d634a19be33 Reviewed-on: https://review.gerrithub.io/c/cue-lang/cue/+/551623 Unity-Result: CUEcueckoo TryBot-Result: CUEcueckoo Reviewed-by: Daniel Martí --- internal/ci/base/base.cue | 4 ++-- internal/ci/github/workflows.cue | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/internal/ci/base/base.cue b/internal/ci/base/base.cue index 161ce00a5d6..b085c21a47e 100644 --- a/internal/ci/base/base.cue +++ b/internal/ci/base/base.cue @@ -43,7 +43,7 @@ import ( ) // Package parameters -#githubRepositoryURL: string +#repositoryURL: string #defaultBranch: string #testDefaultBranch: "ci/test" #botGitHubUser: string @@ -168,7 +168,7 @@ import ( run: "test -z \"$(git status --porcelain)\" || (git status; git diff; false)" } -let _#repositoryURL = #githubRepositoryURL +let _#repositoryURL = #repositoryURL let _#botGitHubUser = #botGitHubUser let _#botGitHubUserTokenSecretsKey = #botGitHubUserTokenSecretsKey diff --git a/internal/ci/github/workflows.cue b/internal/ci/github/workflows.cue index baa8a90863a..beafb427f09 100644 --- a/internal/ci/github/workflows.cue +++ b/internal/ci/github/workflows.cue @@ -72,7 +72,7 @@ _gerrithub: gerrithub & { // Perhaps rename the import to something more obviously not intended to be // used, and then rename the field base? _base: base & { - #githubRepositoryURL: core.githubRepositoryURL + #repositoryURL: core.githubRepositoryURL #defaultBranch: core.defaultBranch #botGitHubUser: "cueckoo" #botGitHubUserTokenSecretsKey: "CUECKOO_GITHUB_PAT"