Skip to content

Commit

Permalink
merge: apply changes from main into mock-observations-model.
Browse files Browse the repository at this point in the history
  • Loading branch information
narekhovhannisyan committed Jan 22, 2024
2 parents 9908465 + 888f6af commit 743b2bd
Show file tree
Hide file tree
Showing 9 changed files with 10,441 additions and 5,175 deletions.
9 changes: 5 additions & 4 deletions .github/workflows/nodejs-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,14 @@ jobs:
uses: actions/setup-node@v3
with:
node-version: 18
cache: 'yarn'
cache: 'npm'

- name: Install dependencies
run: yarn install
run: npm install

- name: Run lint
run: yarn lint
run: npm run lint

- name: Run tests
run: yarn test --silent
run: npm run test --silent

2 changes: 1 addition & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ Add and commit:

Commit your changes in logical chunks. Please do not push all changes in one commit.

> Run `yarn fix` before commiting for not having conflict with CI linter.
> Run `npm run fix` before commiting for not having conflict with CI linter.
Please adhere to these [Commit message guidelines](#commit-message-guidelines)
or your code is unlikely be merged into the main project.
Expand Down
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
- [Azure Importer](./src/lib/azure-importer/README.md)
- [Boavizta](./src/lib/boavizta/README.md)
- [CCF](./src/lib/ccf/README.md)
- [CO2.JS](./src/lib/co2js/README.md)
- [Teads AWS](./src/lib/teads-aws/README.md)
- [Teads TDP Curve](./src/lib/teads-curve/README.md)
- [Watt Time](./src/lib/watt-time/README.md)
Expand Down
Loading

0 comments on commit 743b2bd

Please sign in to comment.