From 59f4ce98dd51572f0f135e6f5727b64415640a71 Mon Sep 17 00:00:00 2001 From: Francesco Novy Date: Thu, 9 Feb 2023 09:23:25 +0100 Subject: [PATCH 1/5] ci: fix yaml (again) --- .github/workflows/gitflow-sync-master.yml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/workflows/gitflow-sync-master.yml b/.github/workflows/gitflow-sync-master.yml index 79961c7c6771..6582bbede98a 100644 --- a/.github/workflows/gitflow-sync-master.yml +++ b/.github/workflows/gitflow-sync-master.yml @@ -1,9 +1,10 @@ name: Gitflow - Sync develop into master on: pull_request: - - types: [closed] - - branches: - - 'develop' + types: + - closed + branches: + - develop env: MAIN_BRANCH: master From efb2569c46732309c94f7bb98bc3c0a086f35a04 Mon Sep 17 00:00:00 2001 From: Francesco Novy Date: Thu, 9 Feb 2023 09:34:17 +0100 Subject: [PATCH 2/5] fix ember lint --- packages/ember/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/ember/package.json b/packages/ember/package.json index e6c2f0883d7e..e75e32cb5089 100644 --- a/packages/ember/package.json +++ b/packages/ember/package.json @@ -21,7 +21,7 @@ "clean": "yarn rimraf sentry-ember-*.tgz dist tmp build .node_modules.ember-try package.json.ember-try", "lint": "run-p lint:js lint:hbs lint:ts", "lint:hbs": "ember-template-lint .", - "lint:js": "eslint . --cache --cache-location '../../eslintcache/'", + "lint:js": "eslint .", "lint:ts": "tsc", "start": "ember serve", "test": "ember test", From ddb1f21e6dcffeb058f20c1d91703903d9d64dc4 Mon Sep 17 00:00:00 2001 From: Francesco Novy Date: Thu, 9 Feb 2023 09:38:53 +0100 Subject: [PATCH 3/5] add clear cache workflow --- .github/workflows/clear-cache.yml | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 .github/workflows/clear-cache.yml diff --git a/.github/workflows/clear-cache.yml b/.github/workflows/clear-cache.yml new file mode 100644 index 000000000000..40f7141764c3 --- /dev/null +++ b/.github/workflows/clear-cache.yml @@ -0,0 +1,11 @@ +name: Clear all GHA caches +on: + workflow_dispatch: + +jobs: + clear-caches: + name: Delete all caches + runs-on: ubuntu-20.04 + steps: + - name: Clear caches + uses: easimon/wipe-cache@v2 From 0751a49e5cd448a7eef2069832d66f57b1d99101 Mon Sep 17 00:00:00 2001 From: Francesco Novy Date: Thu, 9 Feb 2023 09:41:27 +0100 Subject: [PATCH 4/5] always run `yarn install` --- .github/workflows/build.yml | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 2b0bf82ec337..0c2c7c050404 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -138,8 +138,10 @@ jobs: is_develop: ${{ github.ref == 'refs/heads/develop' }} is_release: ${{ startsWith(github.ref, 'refs/heads/release/') }} is_gitflow_sync: ${{ github.head_ref == 'refs/heads/develop' || github.head_ref == 'refs/heads/master' }} - has_gitflow_label: ${{ github.event_name == 'pull_request' && contains(steps.pr-labels.outputs.labels, ' Gitflow ') }} - force_skip_cache: ${{ github.event_name == 'pull_request' && contains(steps.pr-labels.outputs.labels, ' ci-skip-cache ') }} + has_gitflow_label: + ${{ github.event_name == 'pull_request' && contains(steps.pr-labels.outputs.labels, ' Gitflow ') }} + force_skip_cache: + ${{ github.event_name == 'pull_request' && contains(steps.pr-labels.outputs.labels, ' ci-skip-cache ') }} job_install_deps: name: Install Dependencies @@ -172,7 +174,6 @@ jobs: key: ${{ steps.compute_lockfile_hash.outputs.hash }} - name: Install dependencies - if: steps.cache_dependencies.outputs.cache-hit == '' || needs.job_get_metadata.outputs.force_skip_cache == 'true' run: yarn install --ignore-engines --frozen-lockfile outputs: dependency_cache_key: ${{ steps.compute_lockfile_hash.outputs.hash }} @@ -215,7 +216,8 @@ jobs: path: node_modules/.cache/nx key: nx-Linux-${{ github.ref }}-${{ env.HEAD_COMMIT }} # On develop branch, we want to _store_ the cache (so it can be used by other branches), but never _restore_ from it - restore-keys: ${{needs.job_get_metadata.outputs.is_develop == 'false' && env.NX_CACHE_RESTORE_KEYS || 'nx-never-restore'}} + restore-keys: + ${{needs.job_get_metadata.outputs.is_develop == 'false' && env.NX_CACHE_RESTORE_KEYS || 'nx-never-restore'}} - name: Build packages # 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: needs: [job_get_metadata, job_build] runs-on: ubuntu-20.04 timeout-minutes: 30 - if: contains(github.event.pull_request.labels.*.name, 'ci-overhead-measurements') || needs.job_get_metadata.outputs.is_develop == 'true' + if: | + contains(github.event.pull_request.labels.*.name, 'ci-overhead-measurements') || + needs.job_get_metadata.outputs.is_develop == 'true' steps: - name: Check out current commit (${{ needs.job_get_metadata.outputs.commit_label }}) uses: actions/checkout@v3 From e04962c04a14d5f5e16b7be88ea7c54f9c8f7156 Mon Sep 17 00:00:00 2001 From: Francesco Novy Date: Thu, 9 Feb 2023 09:49:09 +0100 Subject: [PATCH 5/5] revert to old build command --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 44bf2ea2c673..41acc28a1c37 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "private": true, "scripts": { - "build": "node ./scripts/verify-packages-versions.js && lerna run build:types,build:transpile,build:bundle", + "build": "node ./scripts/verify-packages-versions.js && run-s build:types build:transpile build:bundle", "build:bundle": "lerna run build:bundle", "build:dev": "lerna run build:types,build:transpile", "build:dev:filter": "lerna run build:dev --include-filtered-dependencies --include-filtered-dependents --scope",