Skip to content

Commit

Permalink
Merge branch 'cbermudez_t12_generate_api_client_node' into cbermudez9…
Browse files Browse the repository at this point in the history
…7_t14_add_dockerfile
  • Loading branch information
stdevCbermudez committed Apr 12, 2019
2 parents 307013b + 5b59f4f commit 292e667
Show file tree
Hide file tree
Showing 139 changed files with 2,233 additions and 2,952 deletions.
7 changes: 3 additions & 4 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
.idea/
.directory
/lib/skyapi/axios/node_modules
/tests/axios/node_modules
/lib/skyapi/node/node_modules
/tests/node/node_modules
tester/node_modules
tests/axios/node_modules
tests/node/node_modules
13 changes: 6 additions & 7 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@
language: nodejs
language: node_js

node_js:
- "10.15.1"

before_script:
- make build_axios_client
- make build_node_client
- make build_tester
- make install

script:
- make test_clients


- make test
30 changes: 24 additions & 6 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,11 +1,29 @@
test_clients:
(cd ./dev/tester/ && npm run test )
.DEFAULT_GOAL := help

build_axios_client:
(cd './dev/lib/skyapi/typescript-axios/' && npm install && npm run build)
help:
@grep -E '^[a-zA-Z_-]+:.*?## .*$$' $(MAKEFILE_LIST) | awk 'BEGIN {FS = ":.*?## "}; {printf "\033[36m%-30s\033[0m %s\n", $$1, $$2}'

install: build-axios-client build-axios-tester build-node-client build-node-tester ; ## Build all libraries and tester

test: test-axios-client test-node-client ; ## Test all clients

test-axios-client: ## Test axios client
(cd ./tests/axios/ && npm run test )

test-node-client: ## Test node client
(cd ./tests/node/ && npm run test )

build-axios-client: ## Build axios client
(cd ./lib/skyapi/axios/ && npm install && npm run build)

build-axios-tester: ## Build axios client tester
(cd ./tests/axios/ && npm install)

build-node-client: ## Build node client
(cd './lib/skyapi/node/' && npm install && npm run build)

build_node_client:
(cd './dev/lib/skyapi/typescript-node/' && npm install && npm run build)
build-node-tester: ## Build node client tester
(cd './tests/node/' && npm install)

build_tester:
(cd './dev/tester/' && npm run setup)
Expand Down
32 changes: 0 additions & 32 deletions dev/tester/index.js

This file was deleted.

26 changes: 0 additions & 26 deletions dev/tester/package-lock.json

This file was deleted.

15 changes: 0 additions & 15 deletions dev/tester/package.json

This file was deleted.

File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Loading

0 comments on commit 292e667

Please sign in to comment.