Skip to content

Commit

Permalink
Merge branch 'next' into pr/9951
Browse files Browse the repository at this point in the history
  • Loading branch information
shilman committed Mar 12, 2020
2 parents 969907e + 396f196 commit d603f7f
Show file tree
Hide file tree
Showing 356 changed files with 9,249 additions and 4,757 deletions.
29 changes: 23 additions & 6 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ aliases:
- image: circleci/node:10

jobs:
build:
install:
<<: *defaults
steps:
- checkout
Expand All @@ -21,9 +21,6 @@ jobs:
- run:
name: Check that yarn.lock is not corrupted
command: yarn repo-dirty-check
- run:
name: Bootstrap
command: yarn bootstrap --core
- save_cache:
name: Cache core dependencies
key: core-dependencies-v4-{{ checksum "yarn.lock" }}
Expand All @@ -40,6 +37,23 @@ jobs:
- dev-kits
- app
- lib
build:
<<: *defaults
steps:
- checkout
- attach_workspace:
at: .
- run:
name: Bootstrap
command: yarn bootstrap --core
- persist_to_workspace:
root: .
paths:
- examples
- addons
- dev-kits
- app
- lib
chromatic:
<<: *defaults
steps:
Expand Down Expand Up @@ -111,7 +125,7 @@ jobs:
yarn packtracker
examples:
<<: *defaults
parallelism: 4
parallelism: 10
steps:
- checkout
- attach_workspace:
Expand Down Expand Up @@ -292,7 +306,10 @@ jobs:
workflows:
test:
jobs:
- build
- install
- build:
requires:
- install
- lint:
requires:
- build
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/tests-cli.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
- uses: actions/setup-node@v1
with:
node-version: '10.x'
- uses: actions/checkout@v1
- uses: actions/checkout@v2
- name: Cache node modules
uses: actions/cache@v1
with:
Expand All @@ -40,7 +40,7 @@ jobs:
- uses: actions/setup-node@v1
with:
node-version: '10.x'
- uses: actions/checkout@v1
- uses: actions/checkout@v2
- name: Cache node modules
uses: actions/cache@v1
with:
Expand All @@ -64,7 +64,7 @@ jobs:
- uses: actions/setup-node@v1
with:
node-version: '10.x'
- uses: actions/checkout@v1
- uses: actions/checkout@v2
- name: install, bootstrap
run: |
yarn bootstrap --core
Expand Down
32 changes: 0 additions & 32 deletions .github/workflows/tests-puppeteer.yml

This file was deleted.

6 changes: 3 additions & 3 deletions .github/workflows/tests-unit.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,13 @@ on: [push]
jobs:
build:

name: Test on node ${{ matrix.node_version }} and ${{ matrix.os }}
runs-on: ${{ matrix.os }}
name: Core Unit Tests
runs-on: ubuntu-latest
steps:
- uses: actions/setup-node@v1
with:
node-version: '10.x'
- uses: actions/checkout@v1
- uses: actions/checkout@v2
- name: Cache node modules
uses: actions/cache@v1
with:
Expand Down

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

Loading

0 comments on commit d603f7f

Please sign in to comment.