diff --git a/.github/actions/cache-bootstrap/action.yml b/.github/actions/cache-bootstrap/action.yml index 5f1d565fa0..e42846deb5 100644 --- a/.github/actions/cache-bootstrap/action.yml +++ b/.github/actions/cache-bootstrap/action.yml @@ -9,19 +9,19 @@ inputs: runs: using: composite steps: - # for always overriding cache, use: pat-s/always-upload-cache@v2.1.5 + # for always overriding cache, use: pat-s/always-upload-cache@v2.1.5 - uses: actions/cache@v2 id: cache with: path: | node_modules */*/node_modules - key: ${{ runner.os }}-yarn-${{inputs.extension}}-${{ hashFiles('**/yarn.lock') }} - # We want to only bootstrap and install if no cache is found. + key: ${{ runner.os }}-yarn-${{inputs.extension}}-v5-${{ hashFiles('**/yarn.lock') }} + # We want to only bootstrap and install if no cache is found. # Futhermore, we might want to do a partial, hoisted, bootstrap towards # the base branch if it exists, otherwise we choose develop for this. - run: | - if [[ "${{steps.cache.outputs.cache-hit}}" != "true" ]]; then + if [[ "${{steps.cache.outputs.cache-hit}}" != "true" ]] || [[ "${{inputs.partial}}" != "true" ]]; then yarn install --frozen-lockfile yarn bootstrap --concurrency=2 elif [[ "${{inputs.partial}}" = "true" ]]; then @@ -29,3 +29,5 @@ runs: yarn bootstrap --npm-client=npm --hoist --since "origin/${ref}...HEAD" --concurrency=2 fi shell: bash + +