@@ -136,8 +136,7 @@ jobs:
136136 # Note: These next three have to be checked as strings ('true'/'false')!
137137 is_master : ${{ github.ref == 'refs/heads/master' }}
138138 is_release : ${{ startsWith(github.ref, 'refs/heads/release/') }}
139- force_skip_cache :
140- ${{ github.event_name == 'pull_request' && contains(steps.pr-labels.outputs.labels, ' ci-skip-cache ') }}
139+ force_skip_cache : ${{ github.event_name == 'pull_request' && contains(github.event.pull_request.labels.*.name, 'ci-skip-cache') }}
141140
142141 job_install_deps :
143142 name : Install Dependencies
@@ -168,8 +167,7 @@ jobs:
168167 key : ${{ steps.compute_lockfile_hash.outputs.hash }}
169168
170169 - name : Install dependencies
171- if :
172- steps.cache_dependencies.outputs.cache-hit == '' || needs.job_get_metadata.outputs.force_skip_cache == 'true'
170+ if : steps.cache_dependencies.outputs.cache-hit == '' || needs.job_get_metadata.outputs.force_skip_cache == 'true'
173171 run : yarn install --ignore-engines --frozen-lockfile
174172 outputs :
175173 dependency_cache_key : ${{ steps.compute_lockfile_hash.outputs.hash }}
@@ -212,8 +210,7 @@ jobs:
212210 path : node_modules/.cache/nx
213211 key : nx-Linux-${{ github.ref }}-${{ env.HEAD_COMMIT }}
214212 # On master branch, we want to _store_ the cache (so it can be used by other branches), but never _restore_ from it
215- restore-keys :
216- ${{needs.job_get_metadata.outputs.is_master == 'false' && env.NX_CACHE_RESTORE_KEYS || 'nx-never-restore'}}
213+ restore-keys : ${{needs.job_get_metadata.outputs.is_master == 'false' && env.NX_CACHE_RESTORE_KEYS || 'nx-never-restore'}}
217214
218215 - name : Build packages
219216 # Under normal circumstances, using the git SHA as a cache key, there shouldn't ever be a cache hit on the built
@@ -797,7 +794,7 @@ jobs:
797794 needs : [job_get_metadata, job_build]
798795 runs-on : ubuntu-20.04
799796 timeout-minutes : 30
800- if : contains(github.event.pull_request.labels.*.name, 'ci-overhead-measurements')
797+ if : contains(github.event.pull_request.labels.*.name, 'ci-overhead-measurements') || needs.job_get_metadata.outputs.is_master == 'true'
801798 steps :
802799 - name : Check out current commit (${{ needs.job_get_metadata.outputs.commit_label }})
803800 uses : actions/checkout@v3
0 commit comments