Skip to content

Commit 5420835

Browse files
authored
Merge branch 'main' into joshmgross/minimatch-license
2 parents b7f2567 + 0337783 commit 5420835

File tree

7 files changed

+112
-88
lines changed

7 files changed

+112
-88
lines changed

.github/workflows/check-dist.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,12 +22,12 @@ jobs:
2222
runs-on: ubuntu-latest
2323

2424
steps:
25-
- uses: actions/checkout@v2
25+
- uses: actions/checkout@v3
2626

27-
- name: Set Node.js 12.x
27+
- name: Set Node.js 16.x
2828
uses: actions/setup-node@v3
2929
with:
30-
node-version: 12.x
30+
node-version: 16.x
3131
cache: npm
3232

3333
- name: Install dependencies
@@ -46,7 +46,7 @@ jobs:
4646
id: diff
4747

4848
# If index.js was different than expected, upload the expected version as an artifact
49-
- uses: actions/upload-artifact@v2
49+
- uses: actions/upload-artifact@v3
5050
if: ${{ failure() && steps.diff.conclusion == 'failure' }}
5151
with:
5252
name: dist

.github/workflows/ci.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,10 @@ jobs:
1010
ci:
1111
runs-on: ubuntu-latest
1212
steps:
13-
- uses: actions/checkout@v2
14-
- uses: actions/setup-node@v2
13+
- uses: actions/checkout@v3
14+
- uses: actions/setup-node@v3
1515
with:
16-
node-version: 12
16+
node-version: 16
1717
cache: npm
1818
- run: npm ci
1919
- run: npm run style:check

.github/workflows/integration.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ jobs:
1010
test-return:
1111
runs-on: ubuntu-latest
1212
steps:
13-
- uses: actions/checkout@v2
13+
- uses: actions/checkout@v3
1414
- id: output-set
1515
uses: ./
1616
with:
@@ -25,7 +25,7 @@ jobs:
2525
test-relative-require:
2626
runs-on: ubuntu-latest
2727
steps:
28-
- uses: actions/checkout@v2
28+
- uses: actions/checkout@v3
2929
- id: output-set
3030
uses: ./
3131
with:
@@ -40,8 +40,8 @@ jobs:
4040
test-npm-require:
4141
runs-on: ubuntu-latest
4242
steps:
43-
- uses: actions/checkout@v2
44-
- uses: actions/cache@v2
43+
- uses: actions/checkout@v3
44+
- uses: actions/cache@v3
4545
with:
4646
path: ~/.npm
4747
key: ${{runner.os}}-npm-${{hashFiles('**/package-lock.json')}}

.github/workflows/licensed.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
runs-on: ubuntu-latest
1414
name: Check licenses
1515
steps:
16-
- uses: actions/checkout@v2
16+
- uses: actions/checkout@v3
1717
with:
1818
fetch-depth: 0 # prefer to use a full fetch for licensed workflows
1919
# https://github.com/jonabc/setup-licensed/releases/tag/v1.1.1

.github/workflows/pull-request-test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ jobs:
99
pull-request-test:
1010
runs-on: ubuntu-latest
1111
steps:
12-
- uses: actions/checkout@v2
12+
- uses: actions/checkout@v3
1313
- uses: ./
1414
with:
1515
script: |

README.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -297,7 +297,7 @@ jobs:
297297
echo-input:
298298
runs-on: ubuntu-latest
299299
steps:
300-
- uses: actions/checkout@v2
300+
- uses: actions/checkout@v3
301301
- uses: actions/github-script@v6
302302
with:
303303
script: |
@@ -335,7 +335,7 @@ jobs:
335335
echo-input:
336336
runs-on: ubuntu-latest
337337
steps:
338-
- uses: actions/checkout@v2
338+
- uses: actions/checkout@v3
339339
- uses: actions/github-script@v6
340340
env:
341341
SHA: '${{env.parentSHA}}'
@@ -373,10 +373,10 @@ jobs:
373373
echo-input:
374374
runs-on: ubuntu-latest
375375
steps:
376-
- uses: actions/checkout@v2
377-
- uses: actions/setup-node@v2
376+
- uses: actions/checkout@v3
377+
- uses: actions/setup-node@v3
378378
with:
379-
node-version: 14
379+
node-version: 16
380380
- run: npm ci
381381
# or one-off:
382382
- run: npm install execa
@@ -409,7 +409,7 @@ jobs:
409409
print-stuff:
410410
runs-on: ubuntu-latest
411411
steps:
412-
- uses: actions/checkout@v2
412+
- uses: actions/checkout@v3
413413
- uses: actions/github-script@v6
414414
with:
415415
script: |

0 commit comments

Comments
 (0)