From 43a8adad10b10803af9f6570ecb1cd2aa1757e62 Mon Sep 17 00:00:00 2001 From: Simen Bekkhus Date: Fri, 13 Aug 2021 17:13:25 +0200 Subject: [PATCH] chore: use builtin dep caching in actions/setup-node (#11747) --- .github/workflows/nodejs.yml | 50 ++++++------------------------------ 1 file changed, 8 insertions(+), 42 deletions(-) diff --git a/.github/workflows/nodejs.yml b/.github/workflows/nodejs.yml index 60835102ff4a..34cafe152b98 100644 --- a/.github/workflows/nodejs.yml +++ b/.github/workflows/nodejs.yml @@ -24,20 +24,10 @@ jobs: steps: - uses: actions/checkout@v2.3.4 - - uses: actions/setup-node@v2.1.5 + - uses: actions/setup-node@v2.4.0 with: node-version: 14.x - - - name: Get yarn cache - id: yarn-cache - run: echo "::set-output name=dir::$(yarn config get cacheFolder)" - - - uses: actions/cache@v2.1.6 - with: - path: ${{ steps.yarn-cache.outputs.dir }} - key: yarn2-${{ hashFiles('yarn.lock') }} - restore-keys: | - yarn2- + cache: yarn - name: Validate cache env: @@ -54,18 +44,10 @@ jobs: steps: - uses: actions/checkout@v2.3.4 - - uses: actions/setup-node@v2.1.5 + - uses: actions/setup-node@v2.4.0 with: node-version: 12.x - - name: Get yarn cache - id: yarn-cache - run: echo "::set-output name=dir::$(yarn config get cacheFolder)" - - uses: actions/cache@v2.1.6 - with: - path: ${{ steps.yarn-cache.outputs.dir }} - key: yarn2-${{ hashFiles('yarn.lock') }} - restore-keys: | - yarn2- + cache: yarn - name: install run: yarn --immutable - name: build @@ -101,18 +83,10 @@ jobs: if: runner.os == 'Windows' - uses: actions/checkout@v2.3.4 - name: Use Node.js ${{ matrix.node-version }} - uses: actions/setup-node@v2.1.5 + uses: actions/setup-node@v2.4.0 with: node-version: ${{ matrix.node-version }} - - name: Get yarn cache - id: yarn-cache - run: echo "::set-output name=dir::$(yarn config get cacheFolder)" - - uses: actions/cache@v2.1.6 - with: - path: ${{ steps.yarn-cache.outputs.dir }} - key: yarn2-${{ hashFiles('yarn.lock') }} - restore-keys: | - yarn2- + cache: yarn - name: install run: yarn --immutable - name: build @@ -141,18 +115,10 @@ jobs: if: runner.os == 'Windows' - uses: actions/checkout@v2.3.4 - name: Use Node.js 14.x - uses: actions/setup-node@v2.1.5 + uses: actions/setup-node@v2.4.0 with: node-version: 14.x - - name: Get yarn cache - id: yarn-cache - run: echo "::set-output name=dir::$(yarn config get cacheFolder)" - - uses: actions/cache@v2.1.6 - with: - path: ${{ steps.yarn-cache.outputs.dir }} - key: yarn2-${{ hashFiles('yarn.lock') }} - restore-keys: | - yarn2- + cache: yarn - name: install run: yarn --immutable - name: build