From 39c363995260c6f4df3ed12759f984833cbc0d65 Mon Sep 17 00:00:00 2001 From: Ryan Ghods Date: Tue, 4 Aug 2020 14:23:36 -0700 Subject: [PATCH] restore from cache for ganache and mosaic as they need devdeps for building integrate install.sh script --- .github/workflows/build.yml | 6 +++--- scripts/install.sh | 15 --------------- 2 files changed, 3 insertions(+), 18 deletions(-) delete mode 100755 scripts/install.sh diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 387c87a8b5a..ad72bd291dd 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -30,7 +30,7 @@ jobs: */*/node_modules key: ${{ runner.os }}-node12-${{ hashFiles('**/package-lock.json') }} - - run: bash ./scripts/install.sh + - run: npm ci if: steps.cache-deps.outputs.cache-hit != 'true' - run: bash ./scripts/ci.sh @@ -56,7 +56,7 @@ jobs: */*/node_modules key: ${{ runner.os }}-node${{ matrix.node }}-${{ hashFiles('**/package-lock.json') }} - - run: bash ./scripts/install.sh + - run: npm ci if: steps.cache-deps.outputs.cache-hit != 'true' - run: bash ./scripts/ci.sh @@ -89,7 +89,7 @@ jobs: */*/node_modules key: ${{ runner.os }}-node12-${{ hashFiles('**/package-lock.json') }} - - run: bash ./scripts/install.sh + - run: npm ci if: steps.cache-deps.outputs.cache-hit != 'true' - run: bash ./scripts/ci.sh diff --git a/scripts/install.sh b/scripts/install.sh deleted file mode 100755 index 6f55e78cccd..00000000000 --- a/scripts/install.sh +++ /dev/null @@ -1,15 +0,0 @@ -#!/usr/bin/env bash - -# This script contains conditional installation logic for CI - -# CI jobs we'd like to skip default installation for: -# Helpful for E2E tests where the dev deps might cause problems -skip=( - "e2e_ganache" - "e2e_mosaic" - "e2e_windows" -) - -if [[ ! " ${skip[@]} " =~ " ${TEST} " ]]; then - npm ci -fi