internal/ci: move pushTipToTryBot workflow to gerrithub package

It's a core workflow that only needs to parameterised in a simple way. This is a mechanical change. The difference in the pushTipToTryBot.yml workflow file is an ordering difference. The files are semantically identical. Signed-off-by: Paul Jolly <paul@myitcv.io> Change-Id: Id69891d4a8ea1b9d7145ae0f26c597839379790e Reviewed-on: https://review.gerrithub.io/c/cue-lang/cue/+/551628 TryBot-Result: CUEcueckoo <cueckoo@cuelang.org> Unity-Result: CUEcueckoo <cueckoo@cuelang.org> Reviewed-by: Daniel Martí <mvdan@mvdan.cc>
cue-lang · Mar 26, 2023 · 0290e04 · 0290e04
1 parent 0cfd8c5
commit 0290e04
Show file tree

Hide file tree

Showing 3 changed files with 34 additions and 30 deletions.
diff --git a/.github/workflows/push_tip_to_trybot.yml b/.github/workflows/push_tip_to_trybot.yml
@@ -13,7 +13,6 @@ jobs:
     defaults:
       run:
         shell: bash
-    if: ${{github.repository == 'cue-lang/cue'}}
     steps:
       - name: Write netrc file for cueckoo Gerrithub
         run: |-
@@ -35,3 +34,4 @@ jobs:
           git remote add trybot https://github.com/cue-lang/cue-trybot
           git fetch origin "${{ github.ref }}"
           git push trybot "FETCH_HEAD:${{ github.ref }}"
+    if: ${{github.repository == 'cue-lang/cue'}}
diff --git a/internal/ci/gerrithub/gerrithub.cue b/internal/ci/gerrithub/gerrithub.cue
@@ -58,7 +58,7 @@ let _#repositoryURLNoScheme = strings.Split(#repositoryURL, "//")[1]
 			"runs-on": #linuxMachine
 			if:        "${{ github.event.client_payload.type == '\(#type)' }}"
 			steps: [
-				#writeNetrcFile,
+				_#writeNetrcFile,
 				// Out of the entire ref (e.g. refs/changes/38/547738/7) we only
 				// care about the CL number and patchset, (e.g. 547738/7).
 				// Note that gerrithub_ref is two path elements.
@@ -92,7 +92,37 @@ let _#repositoryURLNoScheme = strings.Split(#repositoryURL, "//")[1]
 	}
 }
 
-#writeNetrcFile: json.#step & {
+#pushTipToTrybotWorkflow: json.#Workflow & {
+	jobs: [string]: defaults: run: shell: "bash"
+
+	name: "Push tip to \(#trybotKey)"
+
+	concurrency: "push_tip_to_trybot"
+
+	jobs: push: {
+		steps: [
+			_#writeNetrcFile,
+			json.#step & {
+				name: "Push tip to trybot"
+				run:  """
+						mkdir tmpgit
+						cd tmpgit
+						git init
+						git config user.name \(#botGitHubUser)
+						git config user.email \(#botGitHubUserEmail)
+						git config http.https://github.com/.extraheader "AUTHORIZATION: basic $(echo -n \(#botGitHubUser):${{ secrets.\(#botGitHubUserTokenSecretsKey) }} | base64)"
+						git remote add origin \(#gerritHubRepository)
+						git remote add trybot \(#trybotRepositoryURL)
+						git fetch origin "${{ github.ref }}"
+						git push trybot "FETCH_HEAD:${{ github.ref }}"
+						"""
+			},
+		]
+	}
+
+}
+
+_#writeNetrcFile: json.#step & {
 	name: "Write netrc file for cueckoo Gerrithub"
 	run:  """
 			cat <<EOD > ~/.netrc

diff --git a/internal/ci/github/push_tip_to_trybot.cue b/internal/ci/github/push_tip_to_trybot.cue
@@ -16,43 +16,17 @@ package github
 
 import (
 	"cuelang.org/go/internal/ci/core"
-
-	"github.com/SchemaStore/schemastore/src/schemas/json"
 )
 
 // push_tip_to_trybot "syncs" active branches to the trybot repo.
 // Since the workflow is triggered by a push to any of the branches,
 // the step only needs to sync the pushed branch.
-workflows: push_tip_to_trybot: _base.#bashWorkflow & {
-
-	name: "Push tip to trybot"
+workflows: push_tip_to_trybot: _gerrithub.#pushTipToTrybotWorkflow & {
 	on: {
 		push: branches: core.protectedBranchPatterns
 	}
-
-	concurrency: "push_tip_to_trybot"
-
 	jobs: push: {
 		"runs-on": core.linuxMachine
 		if:        "${{github.repository == '\(core.githubRepositoryPath)'}}"
-		steps: [
-			_gerrithub.#writeNetrcFile,
-			json.#step & {
-				name: "Push tip to trybot"
-				run:  """
-						mkdir tmpgit
-						cd tmpgit
-						git init
-						git config user.name \(_gerrithub.#botGitHubUser)
-						git config user.email \(_gerrithub.#botGitHubUserEmail)
-						git config http.https://github.com/.extraheader "AUTHORIZATION: basic $(echo -n \(_gerrithub.#botGitHubUser):${{ secrets.\(_gerrithub.#botGitHubUserTokenSecretsKey) }} | base64)"
-						git remote add origin \(_gerrithub.#gerritHubRepository)
-						git remote add trybot \(_gerrithub.#trybotRepositoryURL)
-						git fetch origin "${{ github.ref }}"
-						git push trybot "FETCH_HEAD:${{ github.ref }}"
-						"""
-			},
-		]
 	}
-
 }