internal/ci: move configuration from workflows.cue to core

This is preparation for later refactor to use core as a parameter to base.params. This change should not result in any .github/workflows changes. Signed-off-by: Paul Jolly <paul@myitcv.io> Change-Id: I30b2cd698f8f456d411a73510bf1b98157b4f85a Reviewed-on: https://review.gerrithub.io/c/cue-lang/cue/+/551532 Unity-Result: CUEcueckoo <cueckoo@cuelang.org> TryBot-Result: CUEcueckoo <cueckoo@cuelang.org> Reviewed-by: Daniel Martí <mvdan@mvdan.cc>
cue-lang · Mar 25, 2023 · 5a0922e · 5a0922e
1 parent 584f3f0
commit 5a0922e
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 13 deletions.
diff --git a/internal/ci/core/core.cue b/internal/ci/core/core.cue
@@ -13,10 +13,18 @@ macosMachine:   "macos-11"
 windowsMachine: "windows-2022"
 
 // Define core URLs that will be used in the codereview.cfg and GitHub workflows
-githubRepositoryURL:  "https://github.com/cue-lang/cue"
-gerritRepositoryURL:  "https://review.gerrithub.io/a/cue-lang/cue"
-githubRepositoryPath: "cue-lang/cue"
-unityRepositoryURL:   "https://github.com/cue-unity/unity"
+githubRepositoryURL:    "https://github.com/cue-lang/cue"
+gerritHubHostname:      "review.gerrithub.io"
+gerritHubRepositoryURL: "https://\(gerritHubHostname)/a/cue-lang/cue"
+githubRepositoryPath:   "cue-lang/cue"
+unityRepositoryURL:     "https://github.com/cue-unity/unity"
+
+botGitHubUser:                      "cueckoo"
+botGitHubUserTokenSecretsKey:       "CUECKOO_GITHUB_PAT"
+botGitHubUserEmail:                 "cueckoo@gmail.com"
+botGerritHubUser:                   botGitHubUser
+botGerritHubUserPasswordSecretsKey: "CUECKOO_GERRITHUB_PASSWORD"
+botGerritHubUserEmail:              botGitHubUserEmail
 
 // Use the latest Go version for extra checks,
 // such as running tests with the data race detector.
@@ -65,7 +73,7 @@ zeroReleaseTagPattern: "*" + zeroReleaseTagSuffix
 
 codeReview: base.#codeReview & {
 	github:      githubRepositoryURL
-	gerrit:      gerritRepositoryURL
+	gerrit:      gerritHubRepositoryURL
 	"cue-unity": unityRepositoryURL
 }
 

diff --git a/internal/ci/github/workflows.cue b/internal/ci/github/workflows.cue
@@ -57,12 +57,12 @@ workflows: close({
 _gerrithub: gerrithub & {
 	#repositoryURL:                      core.githubRepositoryURL
 	#trybotKey:                          _base.trybot.key
-	#botGitHubUser:                      "cueckoo"
-	#botGitHubUserTokenSecretsKey:       "CUECKOO_GITHUB_PAT"
-	#botGitHubUserEmail:                 "cueckoo@gmail.com"
-	#botGerritHubUser:                   #botGitHubUser
-	#botGerritHubUserPasswordSecretsKey: "CUECKOO_GERRITHUB_PASSWORD"
-	#botGerritHubUserEmail:              #botGitHubUserEmail
+	#botGitHubUser:                      core.botGitHubUser
+	#botGitHubUserTokenSecretsKey:       core.botGitHubUserTokenSecretsKey
+	#botGitHubUserEmail:                 core.botGitHubUserEmail
+	#botGerritHubUser:                   core.botGitHubUser
+	#botGerritHubUserPasswordSecretsKey: core.botGerritHubUserPasswordSecretsKey
+	#botGerritHubUserEmail:              core.botGitHubUserEmail
 }
 
 // _base is an instance of ./base, parameterised by the properties of this
@@ -74,8 +74,8 @@ _gerrithub: gerrithub & {
 _base: base & {
 	#githubRepositoryURL:          core.githubRepositoryURL
 	#defaultBranch:                core.defaultBranch
-	#botGitHubUser:                "cueckoo"
-	#botGitHubUserTokenSecretsKey: "CUECKOO_GITHUB_PAT"
+	#botGitHubUser:                core.botGitHubUser
+	#botGitHubUserTokenSecretsKey: core.botGitHubUserTokenSecretsKey
 	#protectedBranchPatterns:      core.protectedBranchPatterns
 	#releaseTagPattern:            core.releaseTagPattern
 }