diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index 61e8761..60d5b73 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -1,34 +1,34 @@ -name: Linting - -env: - COMPOSER_VERSION: "2" - COMPOSER_CACHE: "${{ github.workspace }}/.composer-cache" +name: JS Linting on: push: branches: - develop - trunk + paths: + - '**.js' pull_request: branches: - develop + paths: + - '**.js' jobs: eslint: - name: eslint runs-on: ubuntu-latest steps: - - uses: actions/checkout@v4 + - name: Checkout + uses: actions/checkout@v4 - - name: Setup node v16 and npm cache + - name: Setup node and npm cache uses: actions/setup-node@v4 with: node-version-file: .nvmrc cache: npm - name: Install Node dependencies - run: npm ci --no-optional + run: npm ci --omit=optional - name: Get updated JS files id: changed-files @@ -36,57 +36,7 @@ jobs: with: files: | **/*.js - **/*.json - name: Run JS linting - run: | - if [[ "${{ steps.changed-files.outputs.any_changed }}" == 'true' && "${{ github.event_name }}" == "pull_request" ]]; then - npx wp-scripts lint-js ${{ steps.changed-files.outputs.all_changed_files }} - elif [[ "${{ github.event_name }}" == "push" ]]; then - npm run lint:js - fi - - phpcs: - name: phpcs - runs-on: ubuntu-latest - - steps: - - name: Checkout - uses: actions/checkout@v4 - - - name: Set standard 10up cache directories - run: | - composer config -g cache-dir "${{ env.COMPOSER_CACHE }}" - - - name: Prepare composer cache - uses: actions/cache@v4 - with: - path: ${{ env.COMPOSER_CACHE }} - key: composer-${{ env.COMPOSER_VERSION }}-${{ hashFiles('**/composer.lock') }} - restore-keys: | - composer-${{ env.COMPOSER_VERSION }}- - - - name: Set PHP version - uses: shivammathur/setup-php@v2 - with: - php-version: '7.4' - coverage: none - tools: composer:v2 - - - name: Install dependencies - run: composer install - - - name: Get updated PHP files - id: changed-files - uses: tj-actions/changed-files@v42 - with: - files: | - **/*.php - - - name: PHPCS check - run: | - if [[ "${{ steps.changed-files.outputs.any_changed }}" == 'true' && "${{ github.event_name }}" == "pull_request" ]]; then - ./vendor/bin/phpcs ${{ steps.changed-files.outputs.all_changed_files }} -s --runtime-set testVersion 7.4- - elif [[ "${{ github.event_name }}" == "push" ]]; then - ./vendor/bin/phpcs . -s --runtime-set testVersion 7.4- - fi + if: ${{ steps.changed-files.outputs.any_changed == 'true' }} + run: ./node_modules/.bin/10up-toolkit lint-js ${{ steps.changed-files.outputs.all_changed_files }}