File tree Expand file tree Collapse file tree 3 files changed +18
-1
lines changed Expand file tree Collapse file tree 3 files changed +18
-1
lines changed Original file line number Diff line number Diff line change @@ -14,17 +14,24 @@ jobs:
1414
1515 steps :
1616 - uses : actions/checkout@v5
17+
1718 - uses : actions/setup-node@v5
1819 with :
1920 node-version : 20
2021
22+ <<<<<<< HEAD
21232224 with :
2325 version : 10.15.1
2426
2527 - run : pnpm install
2628 - run : npm run lint:git
2729 - run : npm run lint:js
30+ =======
31+ - run : npm ci
32+
33+ - run : npm run lint
34+ >>>>>>> 8c794af (v6.11.0...v6.11.1)
2835
2936 test :
3037 needs : lint
@@ -46,15 +53,21 @@ jobs:
4653
4754 steps :
4855 - uses : actions/checkout@v5
56+
4957 - uses : actions/setup-node@v5
5058 with :
5159 node-version : ${{ matrix.node }}
5260
61+ <<<<<<< HEAD
53625463 with :
5564 version : 10.15.1
5665
5766 - run : pnpm install
67+ =======
68+ - run : npm ci
69+
70+ >>>>>>> 8c794af (v6.11.0...v6.11.1)
5871 - run : npm test
5972 continue-on-error : ${{ matrix.os == 'macos-latest' }}
6073 env :
7285 with :
7386 ref : ${{ github.head_ref }}
7487 token : ${{ secrets.GitHubToken }}
88+
7589 - uses : actions/setup-node@v5
7690 with :
7791 node-version : 20
Original file line number Diff line number Diff line change @@ -13,13 +13,16 @@ jobs:
1313 steps :
1414 - uses : actions/checkout@v5
1515
16+ <<<<<<< HEAD
1617 with :
1718 fetch-depth : 0
1819
1920 - run : |
2021 git config user.name github-actions
2122 git config user.email [email protected] 2223
24+ =======
25+ >>>>>>> 8c794af (v6.11.0...v6.11.1)
2326 - uses : actions/setup-node@v5
2427 with :
2528 node-version : 20
Original file line number Diff line number Diff line change 1313 },
1414 {
1515 "name" : " @kellyselden/node-template" ,
16- "version" : " 6.11.0 " ,
16+ "version" : " 6.11.1 " ,
1717 "blueprints" : [
1818 {
1919 "name" : " @kellyselden/node-template" ,
You can’t perform that action at this time.
0 commit comments