Skip to content
This repository was archived by the owner on Feb 27, 2024. It is now read-only.

Commit 871967f

Browse files
author
Greg Rickaby
authored
Merge branch 'canary' into feature/refactor-displayblock
2 parents 2b47413 + b6b0989 commit 871967f

File tree

5 files changed

+122
-70
lines changed

5 files changed

+122
-70
lines changed

.github/workflows/assertions.yml

Lines changed: 8 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212

1313
strategy:
1414
matrix:
15-
node-version: [14.x]
15+
node-version: ["lts/*"]
1616

1717
steps:
1818
- name: Checkout repository
@@ -21,14 +21,14 @@ jobs:
2121
token: ${{ github.token }}
2222

2323
- name: Use Node.js ${{ matrix.node-version }}
24-
uses: actions/setup-node@v2.5.1
24+
uses: actions/setup-node@v2
2525
with:
2626
node-version: ${{ matrix.node-version }}
2727

2828
- name: Update NPM
2929
run: npm i -g npm@latest
3030

31-
- name: Cache NPM dependencies
31+
- name: Cache NPM Dependencies
3232
uses: actions/cache@v2
3333
with:
3434
path: ~/.npm
@@ -38,21 +38,18 @@ jobs:
3838
${{ runner.os }}-build-
3939
${{ runner.os }}-
4040
41-
- name: Install Docs
41+
- name: Install Dependencies
4242
run: |
43-
cd docs
44-
npm i
43+
cd frontend
44+
npm i --legacy-peer-deps
45+
cd ../docs
46+
npm i --legacy-peer-deps
4547
4648
- name: Lint Docs
4749
run: |
4850
cd docs
4951
npx markdownlint 'docs/**/*.md'
5052
51-
- name: Install Frontend
52-
run: |
53-
cd frontend
54-
npm i
55-
5653
- name: Lint Frontend
5754
run: |
5855
cd frontend

.github/workflows/chromatic.yml

Lines changed: 55 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,55 @@
1+
name: Chromatic
2+
3+
on:
4+
pull_request:
5+
branches: canary
6+
7+
workflow_dispatch:
8+
9+
jobs:
10+
chromatic:
11+
runs-on: ubuntu-latest
12+
13+
strategy:
14+
matrix:
15+
node-version: ["lts/*"]
16+
17+
steps:
18+
- name: Checkout Repository
19+
uses: actions/checkout@v2
20+
with:
21+
token: ${{ github.token }}
22+
fetch-depth: 0
23+
24+
- name: Use Node.js ${{ matrix.node-version }}
25+
uses: actions/setup-node@v2
26+
with:
27+
node-version: ${{ matrix.node-version }}
28+
29+
- name: Update NPM
30+
run: npm i -g npm@latest
31+
32+
- name: Cache NPM Dependencies
33+
uses: actions/cache@v2
34+
with:
35+
path: ~/.npm
36+
key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('**/package-lock.json') }}
37+
restore-keys: |
38+
${{ runner.os }}-build-${{ env.cache-name }}-
39+
${{ runner.os }}-build-
40+
${{ runner.os }}-
41+
42+
- name: Install Dependencies
43+
run: |
44+
cd frontend
45+
npm i --legacy-peer-deps
46+
47+
- name: Publish to Chromatic
48+
uses: chromaui/action@v1
49+
with:
50+
token: ${{ github.token }}
51+
projectToken: ${{ secrets.CHROMATIC_PROJECT_TOKEN }}
52+
workingDir: frontend
53+
exitZeroOnChanges: true
54+
exitOnceUploaded: true
55+
skip: "dependabot/**"

.github/workflows/codeql-analysis.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
name: 'CodeQL'
1+
name: "CodeQL"
22

33
on:
44
schedule:
5-
- cron: '0 0 * * *'
5+
- cron: "0 0 * * *"
66

77
workflow_dispatch:
88

@@ -18,7 +18,7 @@ jobs:
1818
strategy:
1919
fail-fast: false
2020
matrix:
21-
language: ['javascript']
21+
language: ["javascript"]
2222

2323
steps:
2424
- name: Checkout repository

frontend/package-lock.json

Lines changed: 54 additions & 54 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

frontend/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@
6161
},
6262
"devDependencies": {
6363
"@arkweid/lefthook": "^0.7.7",
64-
"@babel/core": "^7.16.7",
64+
"@babel/core": "^7.16.10",
6565
"@next/bundle-analyzer": "^12.0.8",
6666
"@storybook/addon-a11y": "^6.4.13",
6767
"@storybook/addon-essentials": "^6.4.13",
@@ -78,7 +78,7 @@
7878
"eslint-config-next": "^12.0.8",
7979
"eslint-config-prettier": "^8.3.0",
8080
"eslint-plugin-jest": "^25.7.0",
81-
"eslint-plugin-jsdoc": "^37.6.1",
81+
"eslint-plugin-jsdoc": "^37.6.2",
8282
"eslint-plugin-prettier": "^4.0.0",
8383
"identity-obj-proxy": "^3.0.0",
8484
"jest": "^27.4.7",

0 commit comments

Comments
 (0)