From a1ec9de2e9280067d81b3823f62e7fc70f93865f Mon Sep 17 00:00:00 2001 From: Florent Poinsard Date: Thu, 7 Dec 2023 19:54:56 -0600 Subject: [PATCH 1/3] Add step to static check to ensure consistency of GHA workflows Signed-off-by: Florent Poinsard --- .github/workflows/static_checks_etc.yml | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/.github/workflows/static_checks_etc.yml b/.github/workflows/static_checks_etc.yml index a2cd18996a7..2285895b0db 100644 --- a/.github/workflows/static_checks_etc.yml +++ b/.github/workflows/static_checks_etc.yml @@ -97,6 +97,10 @@ jobs: - 'changelog/**' - './go/tools/releases/**' - '.github/workflows/static_checks_etc.yml' + workflows: + - '.github/**' + - 'Makefile' + - 'test/ci_workflow_gen.go' - name: Set up Go if: steps.skip-workflow.outputs.skip-workflow == 'false' && (steps.changes.outputs.go_files == 'true' || steps.changes.outputs.parser_changes == 'true' || steps.changes.outputs.proto_changes == 'true') @@ -214,3 +218,18 @@ jobs: echo "$output" echo "" exit 1 + + - name: Check make generate_ci_workflows + if: steps.skip-workflow.outputs.skip-workflow == 'false' + run: | + set -e + make generate_ci_workflows + output=$(git status -s) + if [ -z "${output}" ]; then + exit 0 + fi + echo 'Please run `make generate_ci_workflows`, commit and push again.' + echo 'Running `make generate_ci_workflows` on CI yields the following changes:' + echo "$output" + echo "" + exit 1 From cc7f1eb67504b3879bf66fff55a6a35e5676eda6 Mon Sep 17 00:00:00 2001 From: Florent Poinsard Date: Thu, 7 Dec 2023 19:55:13 -0600 Subject: [PATCH 2/3] Test commit Signed-off-by: Florent Poinsard --- .github/workflows/cluster_endtoend_mysql_server_vault.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/cluster_endtoend_mysql_server_vault.yml b/.github/workflows/cluster_endtoend_mysql_server_vault.yml index a26fe5277f1..6807d64cd31 100644 --- a/.github/workflows/cluster_endtoend_mysql_server_vault.yml +++ b/.github/workflows/cluster_endtoend_mysql_server_vault.yml @@ -22,7 +22,7 @@ jobs: - name: Skip CI run: | if [[ "${{contains( github.event.pull_request.labels.*.name, 'Skip CI')}}" == "true" ]]; then - echo "skipping CI due to the 'Skip CI' label" + echo "skipping CI due to the 'Skip CI' label test" exit 1 fi From 772a120afb7f6c67a07aa415653fa014b90498d6 Mon Sep 17 00:00:00 2001 From: Florent Poinsard Date: Thu, 7 Dec 2023 20:00:05 -0600 Subject: [PATCH 3/3] Revert test Signed-off-by: Florent Poinsard --- .github/workflows/cluster_endtoend_mysql_server_vault.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/cluster_endtoend_mysql_server_vault.yml b/.github/workflows/cluster_endtoend_mysql_server_vault.yml index 6807d64cd31..a26fe5277f1 100644 --- a/.github/workflows/cluster_endtoend_mysql_server_vault.yml +++ b/.github/workflows/cluster_endtoend_mysql_server_vault.yml @@ -22,7 +22,7 @@ jobs: - name: Skip CI run: | if [[ "${{contains( github.event.pull_request.labels.*.name, 'Skip CI')}}" == "true" ]]; then - echo "skipping CI due to the 'Skip CI' label test" + echo "skipping CI due to the 'Skip CI' label" exit 1 fi