Skip to content

Commit 2a84e91

Browse files
Merge branch 'master' into azure-not-experimental
2 parents 886a4d2 + a40a6c8 commit 2a84e91

File tree

6 files changed

+7787
-13358
lines changed

6 files changed

+7787
-13358
lines changed

.github/workflows/node.js.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,6 @@ jobs:
2525
uses: actions/setup-node@v2
2626
with:
2727
node-version: ${{ matrix.node-version }}
28-
cache: 'npm'
29-
- run: npm ci
30-
- run: npm test
28+
cache: 'yarn'
29+
- run: yarn
30+
- run: yarn test

.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@ results
1818
*.orig
1919
*.local
2020
.DS_Store
21-
yarn.lock
2221
npm-debug.log
2322
node_modules
2423
coverage
2524
/mocks/handlebars-component/_compile-static-package6/
25+
package-lock.json

.travis.yml

Lines changed: 0 additions & 13 deletions
This file was deleted.

lerna.json

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,6 @@
11
{
2-
"lerna": "2.3.1",
3-
"packages": [
4-
"packages/*"
5-
],
6-
"version": "independent",
7-
"npmClient": "npm",
8-
"npmClientArgs": ["--no-package-lock"]
9-
}
2+
"lerna": "2.3.1",
3+
"packages": ["packages/*"],
4+
"version": "independent",
5+
"npmClient": "yarn"
6+
}

0 commit comments

Comments
 (0)