diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml index 3ece054b..e5989594 100644 --- a/.github/workflows/check.yml +++ b/.github/workflows/check.yml @@ -5,7 +5,7 @@ on: [push, pull_request, workflow_dispatch] jobs: validate: - runs-on: ubuntu-latest + runs-on: ubuntu-22.04 steps: - name: Checkout @@ -36,7 +36,7 @@ jobs: format: - runs-on: ubuntu-latest + runs-on: ubuntu-22.04 needs: validate @@ -57,11 +57,14 @@ jobs: run: npm install --global prettier sort-json - name: Run Prettier - run: prettier --write "local-files/*.json" "local-files/genericTrans/index/*.json" "local-files/genericTrans/lyrics/*.json" + run: prettier --write "local-files/genericTrans/index/*.json" "local-files/genericTrans/lyrics/*.json" "local-files/generic.json" "local-files/localization.json" + # Do not ever sort lyrics alphabetically... - name: Sort JSON files - run: find local-files -type f -name '*.json' -not -path "local-files/genericTrans/*" -not -path "local-files/masterTrans/*" -exec sort-json {} + - + run: | + find local-files/genericTrans/index -type f -exec sort-json {} + + sort-json local-files/generic.json + sort-json local-files/localization.json - name: Authorize Git run: | @@ -70,8 +73,7 @@ jobs: - name: Commit Changes run: | - git add local-files/*.json local-files/**/*.json - git commit -m "chore(format): Format and Sort JSON files" + git commit -am "chore(format): Format and Sort JSON files" if [[ "${{ github.event_name }}" == "pull_request" ]]; then git push origin HEAD:${{ github.head_ref }} else @@ -83,7 +85,7 @@ jobs: update: - runs-on: ubuntu-latest + runs-on: ubuntu-22.04 needs: [validate, format]