From c0d744931c69dc0b87c43468b467321d6d564987 Mon Sep 17 00:00:00 2001 From: Adam Ruka Date: Thu, 16 Jul 2020 11:00:15 -0700 Subject: [PATCH] chore: turn off prerequisite check for Gitpod Gitpod doesn't have a running Docker demon currently, so the check fails for it. However, it uses jsii/superchain, so it's guaranteed to have all of the other required tools. So, just skip the check for it completely. --- .gitpod.yml | 2 +- build.sh | 10 ++++++++-- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/.gitpod.yml b/.gitpod.yml index 5491cbd291d9e..92cf51b5ccdd3 100644 --- a/.gitpod.yml +++ b/.gitpod.yml @@ -1,6 +1,6 @@ image: jsii/superchain tasks: - - init: yarn build --skip-test --no-bail + - init: yarn build --skip-test --no-bail --skip-prereqs vscode: extensions: diff --git a/build.sh b/build.sh index 4b251e2f5d1dc..754f7ce10111e 100755 --- a/build.sh +++ b/build.sh @@ -3,6 +3,7 @@ set -euo pipefail bail="--bail" runtarget="build+test" +check_prereqs="true" while [[ "${1:-}" != "" ]]; do case $1 in -h|--help) @@ -18,6 +19,9 @@ while [[ "${1:-}" != "" ]]; do --skip-test|--skip-tests) runtarget="build" ;; + --skip-prereqs) + check_prereqs="false" + ;; *) echo "Unrecognized parameter: $1" exit 1 @@ -41,8 +45,10 @@ fail() { # Check for secrets that should not be committed /bin/bash ./git-secrets-scan.sh -# Verify dependencies before starting the build -/bin/bash ./scripts/check-prerequisites.sh +# Verify all required tools are present before starting the build +if [ "$check_prereqs" == "true" ]; then + /bin/bash ./scripts/check-prerequisites.sh +fi # Prepare for build with references /bin/bash scripts/generate-aggregate-tsconfig.sh > tsconfig.json