Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/shellCheck.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,4 +16,4 @@ jobs:
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683

- name: Lint shell scripts with ShellCheck
run: npm run shellCheck
run: ./scripts/shellCheck.sh
18 changes: 15 additions & 3 deletions .github/workflows/validateActions.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,14 @@ jobs:
run: npm i -g ajv-cli@5.0.0

- name: Validate action and workflow schemas
run: GitHub-Actions/.github/scripts/validateWorkflowSchemas.sh
run: GitHub-Actions/scripts/validateWorkflowSchemas.sh
env:
REPO_ROOT: ${{ steps.repo.outputs.NAME }}

- name: Tell people how to run the failing check
if: failure()
run: echo "::error::The validateWorkflowSchemas check failed! To run it locally, go to the root of ${{ steps.repo.outputs.NAME }} and run <path_to_github_actions_repo>/scripts/validateWorkflowSchemas.sh"

actionlint:
runs-on: ubuntu-latest
steps:
Expand All @@ -34,10 +38,14 @@ jobs:
uses: Expensify/GitHub-Actions/checkoutRepoAndGitHubActions@main

- name: Lint workflows with actionlint
run: GitHub-Actions/.github/scripts/actionlint.sh
run: GitHub-Actions/scripts/actionlint.sh
env:
REPO_ROOT: ${{ steps.repo.outputs.NAME }}

- name: Tell people how to run the failing check
if: failure()
run: echo "::error::The actionlint check failed! To run it locally, go to the root of ${{ steps.repo.outputs.NAME }} and run <path_to_github_actions_repo>/scripts/actionlint.sh"

validateImmutableActionRefs:
runs-on: ubuntu-latest
steps:
Expand All @@ -46,6 +54,10 @@ jobs:
uses: Expensify/GitHub-Actions/checkoutRepoAndGitHubActions@main

- name: Validate actions refs are immutable
run: GitHub-Actions/.github/scripts/validateImmutableActionRefs.sh
run: GitHub-Actions/scripts/validateImmutableActionRefs.sh
env:
REPO_ROOT: ${{ steps.repo.outputs.NAME }}

- name: Tell people how to run the failing check
if: failure()
run: echo "::error::The validateImmutableActionRefs check failed! To run it locally, go to the root of ${{ steps.repo.outputs.NAME }} and run <path_to_github_actions_repo>/scripts/validateImmutableActionRefs.sh"
4 changes: 2 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -20,5 +20,5 @@ dist/

# Ignore actionlint binary and any leftover directories related to installing it
actionlint*
!.github/scripts/actionlint.sh
!.github/scripts/actionlint_checksums.txt
!scripts/actionlint.sh
!scripts/actionlint_checksums.txt
286 changes: 0 additions & 286 deletions package-lock.json

This file was deleted.

14 changes: 0 additions & 14 deletions package.json

This file was deleted.

File renamed without changes.
4 changes: 2 additions & 2 deletions .github/scripts/shellCheck.sh → scripts/shellCheck.sh
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
#!/bin/bash

ROOT_DIR=$(cd -- "$(dirname -- "${BASH_SOURCE[0]}")/../.." &>/dev/null && pwd)
ROOT_DIR=$(cd -- "$(dirname -- "${BASH_SOURCE[0]}")/.." &>/dev/null && pwd)
readonly ROOT_DIR

source "$ROOT_DIR"/.github/scripts/shellUtils.sh
source "$ROOT_DIR"/scripts/shellUtils.sh

readonly DIRECTORIES_TO_IGNORE="
-path $ROOT_DIR/node_modules
Expand Down
File renamed without changes.