Skip to content

Commit

Permalink
Add package lock to repo (#377)
Browse files Browse the repository at this point in the history
* added package-lock.json

* removed test branch from lerna

* removed npm install

* also remove from release workflow

* try caching npm local repo instead

* same for release wf
  • Loading branch information
willarmiros authored Feb 26, 2021
1 parent 066c121 commit 0d806dc
Show file tree
Hide file tree
Showing 5 changed files with 13,131 additions and 14 deletions.
10 changes: 5 additions & 5 deletions .github/workflows/pr-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,21 +28,21 @@ jobs:
steps:
- name: Checkout AWS XRay SDK Node Repository @ default branch latest
uses: actions/checkout@v2

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

- name: Cache NPM modules
uses: actions/cache@v2
with:
path: |
node_modules
*/*/node_modules
key: ${{ matrix.os }}-${{ hashFiles('**/package.json') }}
path: $HOME/.npm
key: ${{ matrix.os }}-${{ hashFiles('package-lock.json') }}

- name: Execute tests with Lerna
if: '!matrix.coverage'
run: |
npm install
npx lerna bootstrap --hoist
npx lerna run test
shell: bash
Expand Down
7 changes: 2 additions & 5 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,14 +25,11 @@ jobs:
- name: Cache NPM modules
uses: actions/cache@v2
with:
path: |
node_modules
*/*/node_modules
key: ${{ runner.os }}-${{ hashFiles('**/package.json') }}
path: $HOME/.npm
key: ${{ matrix.os }}-${{ hashFiles('package-lock.json') }}

- name: Execute tests with Lerna
run: |
npm install
npx lerna bootstrap --hoist
npx lerna run test
Expand Down
1 change: 0 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
node_modules
*.log
docs
package-lock.json
.idea/
.nyc_output/
*.lcov
3 changes: 0 additions & 3 deletions lerna.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,6 @@
"sdk_contrib/*"
],
"version": "independent",
"npmClientArgs": [
"--no-package-lock"
],
"command": {
"publish": {
"allowBranch": ["master", "2.x"]
Expand Down
Loading

0 comments on commit 0d806dc

Please sign in to comment.