Skip to content

Commit 531bce6

Browse files
authored
Merge pull request #36 from Expensify/d-param-required
Fix some bugs with the actions required thingy
2 parents 0c7af3c + f594a19 commit 531bce6

File tree

3 files changed

+12
-12
lines changed

3 files changed

+12
-12
lines changed

.github/scripts/validateWorkflowSchemas.sh

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -38,12 +38,12 @@ echo
3838
ACTIONS="$(find "$REPO_ROOT" -type f \( -name "action.yml" -o -name "action.yaml" \) -exec echo -n " -d "{} \;)"
3939
if [[ -z "$ACTIONS" ]]; then
4040
warning "No actions found. Did you remember to run this script from the root of a repo?" >&2
41-
fi
42-
43-
# Disabling shellcheck because we WANT word-splitting on ACTIONS in this case
44-
# shellcheck disable=SC2086
45-
if ! npx ajv --strict=false -s "$TEMP_SCHEMA_DIR/github-action.json" $ACTIONS; then
46-
EXIT_CODE=1
41+
else
42+
# Disabling shellcheck because we WANT word-splitting on ACTIONS in this case
43+
# shellcheck disable=SC2086
44+
if ! npx ajv --strict=false -s "$TEMP_SCHEMA_DIR/github-action.json" $ACTIONS; then
45+
EXIT_CODE=1
46+
fi
4747
fi
4848

4949
echo
@@ -54,11 +54,11 @@ echo
5454
WORKFLOWS="$(find "${REPO_ROOT}/.github/workflows" -type f \( -name "*.yml" -o -name "*.yaml" \) -exec echo -n " -d "{} \;)"
5555
if [[ -z "$WORKFLOWS" ]]; then
5656
warning "No workflows found. Did you remember to run this script from the root of a repo?" >&2
57-
fi
58-
59-
# shellcheck disable=SC2086
60-
if ! npx ajv --strict=false -s "$TEMP_SCHEMA_DIR/github-workflow.json" $WORKFLOWS; then
61-
EXIT_CODE=1
57+
else
58+
# shellcheck disable=SC2086
59+
if ! npx ajv --strict=false -s "$TEMP_SCHEMA_DIR/github-workflow.json" $WORKFLOWS; then
60+
EXIT_CODE=1
61+
fi
6262
fi
6363

6464
echo

.github/workflows/validateActions.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ on:
44
pull_request:
55
types: [opened, synchronize]
66
branches-ignore: [staging, production]
7-
paths: ['.github/**']
87

98
jobs:
109
validateSchemas:

checkoutRepoAndGitHubActions/action.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
name: Checkout target repo and GitHub Actions repo
2+
description: Checkout target repo and GitHub Actions repo
23

34
outputs:
45
NAME:

0 commit comments

Comments
 (0)