diff --git a/.github/scripts/validateWorkflowSchemas.sh b/.github/scripts/validateWorkflowSchemas.sh index d9fbaef..eaa98d5 100755 --- a/.github/scripts/validateWorkflowSchemas.sh +++ b/.github/scripts/validateWorkflowSchemas.sh @@ -38,12 +38,12 @@ echo ACTIONS="$(find "$REPO_ROOT" -type f \( -name "action.yml" -o -name "action.yaml" \) -exec echo -n " -d "{} \;)" if [[ -z "$ACTIONS" ]]; then warning "No actions found. Did you remember to run this script from the root of a repo?" >&2 -fi - -# Disabling shellcheck because we WANT word-splitting on ACTIONS in this case -# shellcheck disable=SC2086 -if ! npx ajv --strict=false -s "$TEMP_SCHEMA_DIR/github-action.json" $ACTIONS; then - EXIT_CODE=1 +else + # Disabling shellcheck because we WANT word-splitting on ACTIONS in this case + # shellcheck disable=SC2086 + if ! npx ajv --strict=false -s "$TEMP_SCHEMA_DIR/github-action.json" $ACTIONS; then + EXIT_CODE=1 + fi fi echo @@ -54,11 +54,11 @@ echo WORKFLOWS="$(find "${REPO_ROOT}/.github/workflows" -type f \( -name "*.yml" -o -name "*.yaml" \) -exec echo -n " -d "{} \;)" if [[ -z "$WORKFLOWS" ]]; then warning "No workflows found. Did you remember to run this script from the root of a repo?" >&2 -fi - -# shellcheck disable=SC2086 -if ! npx ajv --strict=false -s "$TEMP_SCHEMA_DIR/github-workflow.json" $WORKFLOWS; then - EXIT_CODE=1 +else + # shellcheck disable=SC2086 + if ! npx ajv --strict=false -s "$TEMP_SCHEMA_DIR/github-workflow.json" $WORKFLOWS; then + EXIT_CODE=1 + fi fi echo diff --git a/.github/workflows/validateActions.yml b/.github/workflows/validateActions.yml index ca6f66f..9a98343 100644 --- a/.github/workflows/validateActions.yml +++ b/.github/workflows/validateActions.yml @@ -4,7 +4,6 @@ on: pull_request: types: [opened, synchronize] branches-ignore: [staging, production] - paths: ['.github/**'] jobs: validateSchemas: diff --git a/checkoutRepoAndGitHubActions/action.yml b/checkoutRepoAndGitHubActions/action.yml index d19eaaf..f8647e9 100644 --- a/checkoutRepoAndGitHubActions/action.yml +++ b/checkoutRepoAndGitHubActions/action.yml @@ -1,4 +1,5 @@ name: Checkout target repo and GitHub Actions repo +description: Checkout target repo and GitHub Actions repo outputs: NAME: