Skip to content

Commit 33c5ce8

Browse files
committed
chore: metrics collection job should also run on master
1 parent e7b9e64 commit 33c5ce8

File tree

1 file changed

+4
-7
lines changed

1 file changed

+4
-7
lines changed

.github/workflows/build.yml

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -132,8 +132,7 @@ jobs:
132132
# Note: These next three have to be checked as strings ('true'/'false')!
133133
is_master: ${{ github.ref == 'refs/heads/master' }}
134134
is_release: ${{ startsWith(github.ref, 'refs/heads/release/') }}
135-
force_skip_cache:
136-
${{ github.event_name == 'pull_request' && contains(github.event.pull_request.labels.*.name, 'ci-skip-cache') }}
135+
force_skip_cache: ${{ github.event_name == 'pull_request' && contains(github.event.pull_request.labels.*.name, 'ci-skip-cache') }}
137136

138137
job_install_deps:
139138
name: Install Dependencies
@@ -164,8 +163,7 @@ jobs:
164163
key: ${{ steps.compute_lockfile_hash.outputs.hash }}
165164

166165
- name: Install dependencies
167-
if:
168-
steps.cache_dependencies.outputs.cache-hit == '' || needs.job_get_metadata.outputs.force_skip_cache == 'true'
166+
if: steps.cache_dependencies.outputs.cache-hit == '' || needs.job_get_metadata.outputs.force_skip_cache == 'true'
169167
run: yarn install --ignore-engines --frozen-lockfile
170168
outputs:
171169
dependency_cache_key: ${{ steps.compute_lockfile_hash.outputs.hash }}
@@ -208,8 +206,7 @@ jobs:
208206
path: node_modules/.cache/nx
209207
key: nx-Linux-${{ github.ref }}-${{ env.HEAD_COMMIT }}
210208
# On master branch, we want to _store_ the cache (so it can be used by other branches), but never _restore_ from it
211-
restore-keys:
212-
${{needs.job_get_metadata.outputs.is_master == 'false' && env.NX_CACHE_RESTORE_KEYS || 'nx-never-restore'}}
209+
restore-keys: ${{needs.job_get_metadata.outputs.is_master == 'false' && env.NX_CACHE_RESTORE_KEYS || 'nx-never-restore'}}
213210

214211
- name: Build packages
215212
# Under normal circumstances, using the git SHA as a cache key, there shouldn't ever be a cache hit on the built
@@ -795,7 +792,7 @@ jobs:
795792
needs: [job_get_metadata, job_build]
796793
runs-on: ubuntu-20.04
797794
timeout-minutes: 30
798-
if: contains(github.event.pull_request.labels.*.name, 'ci-overhead-measurements')
795+
if: contains(github.event.pull_request.labels.*.name, 'ci-overhead-measurements') || needs.job_get_metadata.outputs.is_master == 'true'
799796
steps:
800797
- name: Check out current commit (${{ needs.job_get_metadata.outputs.commit_label }})
801798
uses: actions/checkout@v3

0 commit comments

Comments
 (0)