Skip to content

Commit

Permalink
chore: merge branch 'master' into fix-measure-circle
Browse files Browse the repository at this point in the history
  • Loading branch information
ahennr committed Aug 25, 2023
2 parents 7437a54 + f5db355 commit 35f3f77
Show file tree
Hide file tree
Showing 5 changed files with 823 additions and 818 deletions.
8 changes: 4 additions & 4 deletions .github/workflows/on-pull-request.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,19 +8,19 @@ jobs:

strategy:
matrix:
node-version: [16.x]
node-version: [18.x]

steps:
- name: Checkout sources
uses: actions/checkout@v2
uses: actions/checkout@v3

- name: Use Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v1
uses: actions/setup-node@v3
with:
node-version: ${{ matrix.node-version }}

- name: Cache Node.js modules 💾
uses: actions/cache@v2
uses: actions/cache@v3
with:
path: ~/.npm
key: ${{ runner.OS }}-node-${{ hashFiles('**/package-lock.json') }}
Expand Down
18 changes: 9 additions & 9 deletions .github/workflows/on-push-master.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,13 @@ jobs:
- name: Checkout sources
uses: actions/checkout@v2

- name: Use Node.js 16.x
uses: actions/setup-node@v1
- name: Use Node.js 18.x
uses: actions/setup-node@v3
with:
node-version: 16.x
node-version: 18.x

- name: Cache Node.js modules 💾
uses: actions/cache@v2
uses: actions/cache@v3
with:
path: ~/.npm
key: ${{ runner.OS }}-node-${{ hashFiles('**/package-lock.json') }}
Expand All @@ -41,15 +41,15 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout sources 🔰
uses: actions/checkout@v2
uses: actions/checkout@v3

- name: Setup Node.js 16 🧮
uses: actions/setup-node@v1
- name: Setup Node.js 18 🧮
uses: actions/setup-node@v3
with:
node-version: 16
node-version: 18

- name: Cache Node.js modules 💾
uses: actions/cache@v2
uses: actions/cache@v3
with:
path: ~/.npm
key: ${{ runner.OS }}-node-${{ hashFiles('**/package-lock.json') }}
Expand Down
1 change: 1 addition & 0 deletions .nvmrc
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
v18
Loading

0 comments on commit 35f3f77

Please sign in to comment.