Merge pull request #2807 from smartcontractkit/chore/update-makefile

GNUmakefile

@@ -50,6 +50,7 @@ gomod: ## Ensure chainlink's go dependencies are installed.
 .PHONY: yarndep
 yarndep: ## Ensure all yarn dependencies are installed
 	yarn install --frozen-lockfile
+	yarn setup:chainlink
 
 .PHONY: gen-builder-cache
 gen-builder-cache: gomod yarndep # generate a cache for the builder image
@@ -58,14 +59,10 @@ gen-builder-cache: gomod yarndep # generate a cache for the builder image
 install-chainlink: chainlink ## Install the chainlink binary.
 	cp $< $(GOBIN)/chainlink
 
-chainlink: $(SGX_BUILD_ENCLAVE) ws-setup operator-ui ## Build the chainlink binary.
+chainlink: $(SGX_BUILD_ENCLAVE) operator-ui ## Build the chainlink binary.
 	CGO_ENABLED=0 go run packr/main.go "${CURDIR}/core/eth" ## embed contracts in .go file
 	go build $(GOFLAGS) -o $@ ./core/
 
-.PHONY: ws-setup
-ws-setup:
-	yarn setup:chainlink
-
 .PHONY: operator-ui
 operator-ui: ## Build the static frontend UI.
 	CHAINLINK_VERSION="$(VERSION)@$(COMMIT_SHA)" yarn workspace @chainlink/operator-ui build

README.md

@@ -27,11 +27,12 @@ Examples of how to utilize and integrate Chainlinks can be found in the [Chainli
 
 ## Install
 
-1. [Install Go 1.13+](https://golang.org/doc/install#install), and add your GOPATH's [bin directory to your PATH](https://golang.org/doc/code.html#GOPATH)
+1. [Install Go 1.14](https://golang.org/doc/install#install), and add your GOPATH's [bin directory to your PATH](https://golang.org/doc/code.html#GOPATH)
 2. Install [NodeJS](https://nodejs.org/en/download/package-manager/) & [Yarn](https://yarnpkg.com/lang/en/docs/install/)
-3. Download Chainlink: `git clone https://github.com/smartcontractkit/chainlink && cd chainlink`
-4. Build and install Chainlink: `make install`
-5. Run the node: `chainlink help`
+3. Install [Postgres 11](https://wiki.postgresql.org/wiki/Detailed_installation_guides).
+4. Download Chainlink: `git clone https://github.com/smartcontractkit/chainlink && cd chainlink`
+5. Build and install Chainlink: `make install`
+6. Run the node: `chainlink help`
 
 ### Ethereum Node Requirements
 

tools/json-api-client/jest.config.js

@@ -2,5 +2,5 @@ module.exports = {
   preset: 'ts-jest',
   testEnvironment: 'node',
   setupFilesAfterEnv: ['<rootDir>/jest.setup.js'],
-  testPathIgnorePatterns: ['/node_modules/'],
+  testPathIgnorePatterns: ['/node_modules/', 'dist/'],
 }