diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 0da57ce98bbc43..c6b4327f4e27bf 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -37,39 +37,36 @@ jobs: with: node-version: ${{ matrix.node_version }} - - name: Get yarn cache directory - id: yarn-cache - run: echo "::set-output name=dir::$(yarn cache dir)" - - name: Set dependencies cache uses: actions/cache@v2 with: - path: ${{ steps.yarn-cache.outputs.dir }} - key: ${{ runner.os }}-${{ matrix.node_version }}-${{ hashFiles('yarn.lock') }} + path: ~/.pnpm-store + key: ${{ runner.os }}-${{ matrix.node_version }}-${{ hashFiles('**/pnpm-lock.yaml') }} restore-keys: | - ${{ runner.os }}-${{ matrix.node_version }}-${{ hashFiles('yarn.lock') }} + ${{ runner.os }}-${{ matrix.node_version }}-${{ hashFiles('**/pnpm-lock.yaml') }} ${{ runner.os }}-${{ matrix.node_version }}- - - name: Versions - run: yarn versions - - - name: Install dependencies - run: yarn install --frozen-lockfile + - name: Install pnpm + deps + uses: pnpm/action-setup@v2.0.1 + with: + version: 6.15.1 + run_install: | + - args: [--frozen-lockfile] - name: Build vite - run: yarn ci-build-vite + run: pnpm run ci-build-vite - name: Build plugin-vue - run: yarn build-plugin-vue + run: pnpm run build-plugin-vue - name: Build plugin-react - run: yarn build-plugin-react + run: pnpm run build-plugin-react - name: Test serve - run: yarn test-serve --runInBand + run: pnpm run test-serve --runInBand - name: Test build - run: yarn test-build --runInBand + run: pnpm run test-build --runInBand lint: runs-on: ubuntu-latest @@ -87,17 +84,23 @@ jobs: - name: Set dependencies cache uses: actions/cache@v2 with: - path: ~/.cache/yarn - key: lint-dependencies-${{ hashFiles('yarn.lock') }} + path: ~/.pnpm-store + key: ${{ runner.os }}-${{ matrix.node_version }}-${{ hashFiles('**/pnpm-lock.yaml') }} restore-keys: | - lint-dependencies-${{ hashFiles('yarn.lock') }} - lint-dependencies- + ${{ runner.os }}-${{ matrix.node_version }}-${{ hashFiles('**/pnpm-lock.yaml') }} + ${{ runner.os }}-${{ matrix.node_version }}- + + - name: Install pnpm + deps + uses: pnpm/action-setup@v2.0.1 + with: + version: 6.15.1 + run_install: | + - args: [--frozen-lockfile] - name: Prepare run: | - yarn install --frozen-lockfile - yarn ci-build-vite - yarn build-plugin-vue + pnpm run ci-build-vite + pnpm run build-plugin-vue - name: Lint - run: yarn lint + run: pnpm run lint