ci: name dispatch workflow differently to default branch push workflow
This allows the status of the two workflows to be distinguished, which
is important for the status badges offered by GitHub (at the moment we
show the status of the "Test" workflow, which means that a broken
dispatch build can show a red status despite the latest master build
succeeding).
Whilst we are at it, re-enable the go:generate of the workflows
themselves.
Change-Id: I2e93ab6839395fc92fec5f1f869c96854b63b22f
Reviewed-on: https://cue-review.googlesource.com/c/cue/+/6887
Reviewed-by: Marcel van Lohuizen <mpvl@golang.org>
Reviewed-by: CUE cueckoo <cueckoo@gmail.com>
diff --git a/.github/workflows/gen.go b/.github/workflows/gen.go
index 440ab08..d4d12be 100644
--- a/.github/workflows/gen.go
+++ b/.github/workflows/gen.go
@@ -1,4 +1,3 @@
package workflows
-// Disable generation of this script for now.
-// go:generate go run cuelang.org/go/cmd/cue cmd genworkflows cuelang.org/go/internal/ci
+//go:generate go run cuelang.org/go/cmd/cue cmd genworkflows cuelang.org/go/internal/ci
diff --git a/.github/workflows/test_dispatch.yml b/.github/workflows/test_dispatch.yml
index 2a05e41..46a8b18 100644
--- a/.github/workflows/test_dispatch.yml
+++ b/.github/workflows/test_dispatch.yml
@@ -1,6 +1,6 @@
# Generated by internal/ci/ci_tool.cue; do not edit
-name: Test
+name: Test Dispatch
env:
GERRIT_COOKIE: ${{ secrets.gerritCookie }}
on:
diff --git a/internal/ci/workflows.cue b/internal/ci/workflows.cue
index 1a5c1a5..3b4432f 100644
--- a/internal/ci/workflows.cue
+++ b/internal/ci/workflows.cue
@@ -7,7 +7,7 @@
workflowsDir: *"./" | string @tag(workflowsDir)
-workflows: [...{file: string, schema: (json.#Workflow&{})}]
+workflows: [...{file: string, schema: (json.#Workflow & {})}]
workflows: [
{
file: "test.yml"
@@ -30,7 +30,7 @@
// TODO: drop when cuelang.org/issue/390 is fixed.
// Declare definitions for sub-schemas
#job: ((json.#Workflow & {}).jobs & {x: _}).x
-#step: ((#job & {steps: _}).steps & [_])[0]
+#step: ((#job & {steps: _}).steps & [_])[0]
#latestGo: "1.14.3"
@@ -161,7 +161,7 @@
}
}
- name: "Test"
+ name: "Test Dispatch"
env: GERRIT_COOKIE: "${{ secrets.gerritCookie }}"
on: ["repository_dispatch"]
defaults: run: shell: "bash"
