ci: tidy up and refactor GitHub workflow specifications

Clean up our workflow definitions by factoring out common aspects of test and test_dispatch workflows. Change-Id: I8efa2615d985ade008efa3c9cd0e7fa330ce3325 Reviewed-on: https://cue-review.googlesource.com/c/cue/+/6103 Reviewed-by: CUE cueckoo <cueckoo@gmail.com> Reviewed-by: Marcel van Lohuizen <mpvl@golang.org>
cue-lang · May 19, 2020 · a801188 · a801188
1 parent 8f09dde
commit a801188
Show file tree

Hide file tree

Showing 4 changed files with 179 additions and 151 deletions.
diff --git a/.github/workflows/test_dispatch.yml b/.github/workflows/test_dispatch.yml
@@ -47,12 +47,11 @@ jobs:
       run: test -z "$(git status --porcelain)" || (git status; git diff; false)
     - name: Post any failures for this matrix entry
       if: ${{ failure() }}
-      run: 'curl -f -s -H "Content-Type: application/json" --request POST --data ''{"labels":
-        { "Code-Review": -1 }, "message":"Build failed for ${{ runner.os }}-${{ matrix.go-version
-        }}; see ${{ github.event.repository.html_url }}/actions/runs/${{ github.run_id
-        }} for more details"}'' -b ~/.gitcookies https://cue-review.googlesource.com/a/changes/${{
-        github.event.client_payload.changeID }}/revisions/${{ github.event.client_payload.commit
-        }}/review'
+      run: 'curl -f -s -H "Content-Type: application/json" --request POST --data ''{"message":"Build
+        failed for ${{ runner.os }}-${{ matrix.go-version }}; see ${{ github.event.repository.html_url
+        }}/actions/runs/${{ github.run_id }} for more details","labels":{"Code-Review":-1}}''
+        -b ~/.gitcookies https://cue-review.googlesource.com/a/changes/${{ github.event.client_payload.changeID
+        }}/revisions/${{ github.event.client_payload.commit }}/review'
     strategy:
       matrix:
         go-version:
@@ -81,8 +80,8 @@ jobs:
     - name: Write the gitcookies file
       run: echo "$GERRIT_COOKIE" > ~/.gitcookies
     - name: Update Gerrit CL message with success message
-      run: 'curl -f -s -H "Content-Type: application/json" --request POST --data ''{"labels":
-        { "Code-Review": 1 }, "message":"Build succeeded for ${{ github.event.repository.html_url
-        }}/actions/runs/${{ github.run_id }}"}'' -b ~/.gitcookies https://cue-review.googlesource.com/a/changes/${{
+      run: 'curl -f -s -H "Content-Type: application/json" --request POST --data ''{"message":"Build
+        succeeded for ${{ github.event.repository.html_url }}/actions/runs/${{ github.run_id
+        }}","labels":{"Code-Review":1}}'' -b ~/.gitcookies https://cue-review.googlesource.com/a/changes/${{
         github.event.client_payload.changeID }}/revisions/${{ github.event.client_payload.commit
         }}/review'
diff --git a/cue.mod/pkg/github.com/SchemaStore/schemastore/schemas/json/github-workflow.cue b/cue.mod/pkg/github.com/SchemaStore/schemastore/schemas/json/github-workflow.cue
@@ -2,7 +2,7 @@ package json
 
 import "strings"
 
-Workflow :: {
+#Workflow: {
 	@jsonschema(schema="http://json-schema.org/draft-07/schema")
 	number | null | bool | string | [...] | {
 		// The name of your workflow. GitHub displays the names of your

diff --git a/internal/ci/ci_tool.cue b/internal/ci/ci_tool.cue
@@ -29,6 +29,6 @@ command: vendorgithubschema: {
 	}
 	convert: exec.Run & {
 		stdin: get.response.body
-		cmd:   "go run cuelang.org/go/cmd/cue import -f -p json -l Workflow:: jsonschema: - --outfile pkg/github.com/SchemaStore/schemastore/schemas/json/github-workflow.cue"
+		cmd:   "go run cuelang.org/go/cmd/cue import -f -p json -l #Workflow: jsonschema: - --outfile pkg/github.com/SchemaStore/schemastore/schemas/json/github-workflow.cue"
 	}
 }