Skip to content

Commit

Permalink
Merge branch '3.0.0'
Browse files Browse the repository at this point in the history
# Conflicts:
#	.circleci/config.yml
#	.gitignore
#	.npmignore
#	README.md
#	package-lock.json
#	package.json
  • Loading branch information
starak committed Apr 2, 2021
2 parents 946033c + 65432dd commit a684652
Show file tree
Hide file tree
Showing 25 changed files with 5,141 additions and 970 deletions.
12 changes: 8 additions & 4 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
version: 2
jobs:
build:
docker: ## Should be node version 6.4 but it does not exist as a cicleci image
- image: circleci/node:6.10
docker:
- image: circleci/node:10.24
steps:
- checkout
- run: echo "Hello"
- run: echo "Starting..."
- restore_cache:
key: dependency-cache-{{ checksum "package.json" }}
- run:
Expand All @@ -14,4 +14,8 @@ jobs:
- save_cache:
key: dependency-cache-{{ checksum "package.json" }}
paths:
- ./node_modules
- ./node_modules
- run:
name: test
command: npm test
- run: echo "Done!"
4 changes: 1 addition & 3 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,10 +1,8 @@
.idea
.idea/
.nyc_output/
node_modules/
npm-debug.log

stdout.log
stderr.log
stdout_stderr.log

.DS_Store
7 changes: 5 additions & 2 deletions .npmignore
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
gfx/
test/
.circleci/
.idea/
.nyc_output/
*.log
examples/
package-lock.json
test*
.circleci/
*.log
Loading

0 comments on commit a684652

Please sign in to comment.