Skip to content

Commit fcf17a8

Browse files
authored
ci: fix yaml (again) (#7107)
1 parent 11e6f09 commit fcf17a8

File tree

5 files changed

+26
-10
lines changed

5 files changed

+26
-10
lines changed

.github/workflows/build.yml

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -138,8 +138,10 @@ jobs:
138138
is_develop: ${{ github.ref == 'refs/heads/develop' }}
139139
is_release: ${{ startsWith(github.ref, 'refs/heads/release/') }}
140140
is_gitflow_sync: ${{ github.head_ref == 'refs/heads/develop' || github.head_ref == 'refs/heads/master' }}
141-
has_gitflow_label: ${{ github.event_name == 'pull_request' && contains(steps.pr-labels.outputs.labels, ' Gitflow ') }}
142-
force_skip_cache: ${{ github.event_name == 'pull_request' && contains(steps.pr-labels.outputs.labels, ' ci-skip-cache ') }}
141+
has_gitflow_label:
142+
${{ github.event_name == 'pull_request' && contains(steps.pr-labels.outputs.labels, ' Gitflow ') }}
143+
force_skip_cache:
144+
${{ github.event_name == 'pull_request' && contains(steps.pr-labels.outputs.labels, ' ci-skip-cache ') }}
143145

144146
job_install_deps:
145147
name: Install Dependencies
@@ -172,7 +174,6 @@ jobs:
172174
key: ${{ steps.compute_lockfile_hash.outputs.hash }}
173175

174176
- name: Install dependencies
175-
if: steps.cache_dependencies.outputs.cache-hit == '' || needs.job_get_metadata.outputs.force_skip_cache == 'true'
176177
run: yarn install --ignore-engines --frozen-lockfile
177178
outputs:
178179
dependency_cache_key: ${{ steps.compute_lockfile_hash.outputs.hash }}
@@ -215,7 +216,8 @@ jobs:
215216
path: node_modules/.cache/nx
216217
key: nx-Linux-${{ github.ref }}-${{ env.HEAD_COMMIT }}
217218
# On develop branch, we want to _store_ the cache (so it can be used by other branches), but never _restore_ from it
218-
restore-keys: ${{needs.job_get_metadata.outputs.is_develop == 'false' && env.NX_CACHE_RESTORE_KEYS || 'nx-never-restore'}}
219+
restore-keys:
220+
${{needs.job_get_metadata.outputs.is_develop == 'false' && env.NX_CACHE_RESTORE_KEYS || 'nx-never-restore'}}
219221

220222
- name: Build packages
221223
# Under normal circumstances, using the git SHA as a cache key, there shouldn't ever be a cache hit on the built
@@ -798,7 +800,9 @@ jobs:
798800
needs: [job_get_metadata, job_build]
799801
runs-on: ubuntu-20.04
800802
timeout-minutes: 30
801-
if: contains(github.event.pull_request.labels.*.name, 'ci-overhead-measurements') || needs.job_get_metadata.outputs.is_develop == 'true'
803+
if: |
804+
contains(github.event.pull_request.labels.*.name, 'ci-overhead-measurements') ||
805+
needs.job_get_metadata.outputs.is_develop == 'true'
802806
steps:
803807
- name: Check out current commit (${{ needs.job_get_metadata.outputs.commit_label }})
804808
uses: actions/checkout@v3

.github/workflows/clear-cache.yml

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
name: Clear all GHA caches
2+
on:
3+
workflow_dispatch:
4+
5+
jobs:
6+
clear-caches:
7+
name: Delete all caches
8+
runs-on: ubuntu-20.04
9+
steps:
10+
- name: Clear caches
11+
uses: easimon/wipe-cache@v2

.github/workflows/gitflow-sync-master.yml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
name: Gitflow - Sync develop into master
22
on:
33
pull_request:
4-
- types: [closed]
5-
- branches:
6-
- 'develop'
4+
types:
5+
- closed
6+
branches:
7+
- develop
78

89
env:
910
MAIN_BRANCH: master

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"private": true,
33
"scripts": {
4-
"build": "node ./scripts/verify-packages-versions.js && lerna run build:types,build:transpile,build:bundle",
4+
"build": "node ./scripts/verify-packages-versions.js && run-s build:types build:transpile build:bundle",
55
"build:bundle": "lerna run build:bundle",
66
"build:dev": "lerna run build:types,build:transpile",
77
"build:dev:filter": "lerna run build:dev --include-filtered-dependencies --include-filtered-dependents --scope",

packages/ember/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
"clean": "yarn rimraf sentry-ember-*.tgz dist tmp build .node_modules.ember-try package.json.ember-try",
2222
"lint": "run-p lint:js lint:hbs lint:ts",
2323
"lint:hbs": "ember-template-lint .",
24-
"lint:js": "eslint . --cache --cache-location '../../eslintcache/'",
24+
"lint:js": "eslint .",
2525
"lint:ts": "tsc",
2626
"start": "ember serve",
2727
"test": "ember test",

0 commit comments

Comments
 (0)