Merge branch 'next' into pr/osdiab/14811

# Conflicts:
#	addons/storyshots/storyshots-core/package.json
#	examples/ember-cli/package.json
#	yarn.lock

.circleci/config.yml

@@ -176,7 +176,7 @@ jobs:
           condition:
             and:
               - not:
-                  equal: [master, << pipeline.git.branch >>]
+                  equal: [main, << pipeline.git.branch >>]
               - not:
                   equal: [next, << pipeline.git.branch >>]
           steps:
@@ -198,7 +198,7 @@ jobs:
           command: yarn test:e2e-framework --clean --all --skip angular11 --skip angular --skip vue3 --skip web_components_typescript --skip cra
           no_output_timeout: 5m
       - store_artifacts:
-          path: /tmp/storybook/cypress
+          path: /tmp/cypress-record
           destination: cypress
   e2e-tests-core:
     executor:
@@ -224,7 +224,7 @@ jobs:
           command: yarn test:e2e-framework vue3 angular angular11 web_components_typescript web_components_lit2
           no_output_timeout: 5m
       - store_artifacts:
-          path: /tmp/storybook/cypress
+          path: /tmp/cypress-record
           destination: cypress
   cra-bench:
     executor:
@@ -271,7 +271,7 @@ jobs:
           name: run e2e tests
           command: yarn test:e2e-framework --pnp sfcVue cra
       - store_artifacts:
-          path: /tmp/storybook/cypress
+          path: /tmp/cypress-record
           destination: cypress
   e2e-tests-examples:
     executor:
@@ -293,7 +293,7 @@ jobs:
           name: cypress run
           command: yarn test:e2e-examples
       - store_artifacts:
-          path: /tmp/storybook/cypress
+          path: /tmp/cypress-record
           destination: cypress
   smoke-tests:
     executor:

.github/workflows/tests-unit.yml

@@ -7,19 +7,15 @@ jobs:
     name: Core Unit Tests
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/setup-node@v1
-      with:
-        node-version: '12.x'
-    - uses: actions/checkout@v2
-    - name: Cache node modules
-      uses: actions/cache@v2
-      with:
-        path: node_modules
-        key: yarn-2-cache-v1-${{ hashFiles('**/yarn.lock') }}
-    - name: install, bootstrap
-      run: |
-        yarn install --immutable
-        yarn bootstrap --core
-    - name: test
-      run: |
-        yarn test --runInBand --ci
+      - uses: actions/checkout@v2
+      - uses: actions/setup-node@v2
+        with:
+          node-version: "12.x"
+          cache: yarn
+      - name: install, bootstrap
+        run: |
+          yarn install --immutable
+          yarn bootstrap --core
+      - name: test
+        run: |
+          yarn test --runInBand --ci

.teamcity/patches/buildTypes/TestWorkflow.kts

@@ -19,7 +19,7 @@ changeBuildType(RelativeId("TestWorkflow")) {
                 branchFilter = """
                     +:<default>
                     +:next
-                    +:master
+                    +:main
                     +:pull/*
                 """.trimIndent()
             }

.teamcity/settings.kts

@@ -426,7 +426,7 @@ object Frontpage : BuildType({
         vcs {
             quietPeriodMode = VcsTrigger.QuietPeriodMode.USE_DEFAULT
             triggerRules = "-:.teamcity/**"
-            branchFilter = "+:master"
+            branchFilter = "+:main"
         }
     }
 })
@@ -518,7 +518,7 @@ object TestWorkflow : BuildType({
             branchFilter = """
                 +:<default>
                 +:next
-                +:master
+                +:main
                 +:pull/*
             """.trimIndent()
         }