From e9ee86ba96bbcb4528f2ac3494e508ef3f67474e Mon Sep 17 00:00:00 2001 From: eric sciple Date: Fri, 24 Jan 2020 17:18:44 -0500 Subject: [PATCH] . --- .github/workflows/workflow.yml | 6 +++--- __tests__/verify-node.sh | 12 ------------ 2 files changed, 3 insertions(+), 15 deletions(-) diff --git a/.github/workflows/workflow.yml b/.github/workflows/workflow.yml index f1520a69..6b2b974d 100644 --- a/.github/workflows/workflow.yml +++ b/.github/workflows/workflow.yml @@ -45,7 +45,7 @@ jobs: node-version: 10.x - name: Verify node and npm - run: __tests__/verify-node.sh 10 5 + run: __tests__/verify-node.sh 10 test-proxy: runs-on: ubuntu-latest @@ -68,7 +68,7 @@ jobs: node-version: 10.x - name: Verify node and npm - run: __tests__/verify-node.sh 10 5 + run: __tests__/verify-node.sh 10 test-bypass-proxy: runs-on: ubuntu-latest @@ -84,4 +84,4 @@ jobs: node-version: 10.x - name: Verify node and npm - run: __tests__/verify-node.sh 10 5 + run: __tests__/verify-node.sh 10 diff --git a/__tests__/verify-node.sh b/__tests__/verify-node.sh index b7ec0f83..389d1858 100755 --- a/__tests__/verify-node.sh +++ b/__tests__/verify-node.sh @@ -5,11 +5,6 @@ if [ -z "$1" ]; then exit 1 fi -if [ -z "$2" ]; then - echo "Must supply npm version argument" - exit 1 -fi - node_version="$(node --version)" echo "Found node version '$node_version'" if [ -z "$(echo $node_version | grep v$1)" ]; then @@ -17,13 +12,6 @@ if [ -z "$(echo $node_version | grep v$1)" ]; then exit 1 fi -npm_version="$(npm --version)" -echo "Found npm version '$npm_version'" -if [ -z "$(echo $npm_version | grep v$2)" ]; then - echo "Unexpected version" - exit 1 -fi - echo "Testing npm install" mkdir -p test-npm-install cd test-npm-install