diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml index f596b36e..c3617315 100644 --- a/.github/workflows/cd.yml +++ b/.github/workflows/cd.yml @@ -9,30 +9,17 @@ jobs: deploy_web: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 - - - name: Setup Node - uses: actions/setup-node@v1 + - uses: actions/checkout@v3 + - uses: pnpm/action-setup@v2 with: - node-version: '14.x' - - - name: Get yarn cache - id: yarn-cache - run: echo "::set-output name=dir::$(yarn cache dir)" - - - name: Cache dependencies - uses: actions/cache@v1 + version: 8.2.0 + - uses: actions/setup-node@v3 with: - path: ${{ steps.yarn-cache.outputs.dir }} - key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }} - restore-keys: | - ${{ runner.os }}-yarn- - - - name: Install dependencies (web) - run: (cd web; yarn install) - - - name: Test (web) - run: (cd web; yarn test) + node-version: 18 + cache: 'pnpm' + cache-dependency-path: '**/pnpm-lock.yaml' + - run: pnpm install --frozen-lockfile + - run: npm test - name: Copy to dist (web) run: | diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index dd329aab..f48f00fb 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -8,27 +8,14 @@ jobs: test: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 - - - name: Setup Node - uses: actions/setup-node@v1 + - uses: actions/checkout@v3 + - uses: pnpm/action-setup@v2 with: - node-version: '14.x' - - - name: Get yarn cache - id: yarn-cache - run: echo "::set-output name=dir::$(yarn cache dir)" - - - name: Cache dependencies - uses: actions/cache@v1 + version: 8.2.0 + - uses: actions/setup-node@v3 with: - path: ${{ steps.yarn-cache.outputs.dir }} - key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }} - restore-keys: | - ${{ runner.os }}-yarn- - - - name: Install dependencies - run: yarn install - - - name: Test - run: yarn test + node-version: 18 + cache: 'pnpm' + cache-dependency-path: '**/pnpm-lock.yaml' + - run: pnpm install --frozen-lockfile + - run: npm test