diff --git a/.github/actions/setup-pnpm/action.yml b/.github/actions/setup-pnpm/action.yml index 1bc09a8af6..55a6f4ec75 100644 --- a/.github/actions/setup-pnpm/action.yml +++ b/.github/actions/setup-pnpm/action.yml @@ -10,24 +10,16 @@ inputs: runs: using: 'composite' steps: - - uses: pnpm/action-setup@v3 - - uses: actions/setup-node@v4 + - name: Checkout repository + uses: pnpm/action-setup@v4 with: - node-version: 20 - - # https://github.com/pnpm/action-setup/tree/v2/?tab=readme-ov-file#use-cache-to-reduce-installation-time - - name: Get pnpm store directory - shell: bash - run: | - echo "STORE_PATH=$(pnpm store path --silent)" >> $GITHUB_ENV + run_install: false - - uses: actions/cache@v4 - name: Setup pnpm cache + - name: Setup Node.js and pnpm + uses: actions/setup-node@v4 with: - path: ${{ env.STORE_PATH }} - key: ${{ runner.os }}-pnpm-${{ hashFiles('pnpm-lock.yaml') }} - restore-keys: | - ${{ runner.os }}-pnpm- + node-version: 20 + cache: 'pnpm' - name: Install dependencies if: ${{ inputs.install == 'yes' }} diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index fc91f2b207..cafe089c9d 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -126,6 +126,11 @@ jobs: fetch-depth: 0 - uses: ./.github/actions/setup-pnpm + with: + install: 'no' + + - name: Install dev dependencies + run: pnpm install --dev - name: Set up Go uses: actions/setup-go@v5 @@ -138,7 +143,7 @@ jobs: run: echo "${{ github.event.pull_request.title }}" | pnpm commitlint --verbose - name: Check style (Node.js) - run: git diff --name-only --diff-filter=ACMRUXB origin/main | grep -E "(.ts$|.tsx$|.js$|.jsx$)" | xargs -r pnpm prettier -c + run: git diff --name-only --diff-filter=ACMRUXB origin/main | xargs -r pnpm prettier -c --ignore-unknown - name: Check Style (Go) run: |