From 7f4498f8b1b2eee693a4d378fa8ef03a5e580b7e Mon Sep 17 00:00:00 2001 From: Anton Kaliaev Date: Tue, 26 Jun 2018 11:10:54 +0400 Subject: [PATCH] remove no longer needed install_abci_apps script Fixes https://circleci.com/gh/tendermint/tendermint/12923?utm_campaign=vcs-integration-link&utm_medium=referral&utm_source=github-build-link --- scripts/dep_utils/parse.sh | 14 -------------- scripts/install_abci_apps.sh | 12 ------------ test/docker/Dockerfile | 7 +++---- 3 files changed, 3 insertions(+), 30 deletions(-) delete mode 100644 scripts/dep_utils/parse.sh delete mode 100644 scripts/install_abci_apps.sh diff --git a/scripts/dep_utils/parse.sh b/scripts/dep_utils/parse.sh deleted file mode 100644 index e6519efa0..000000000 --- a/scripts/dep_utils/parse.sh +++ /dev/null @@ -1,14 +0,0 @@ -#! /bin/bash - -set +u -if [[ "$DEP" == "" ]]; then - DEP=$GOPATH/src/github.com/tendermint/tendermint/Gopkg.lock -fi -set -u - - -set -euo pipefail - -LIB=$1 - -grep -A100 "$LIB" "$DEP" | grep revision | head -n1 | grep -o '"[^"]\+"' | cut -d '"' -f 2 diff --git a/scripts/install_abci_apps.sh b/scripts/install_abci_apps.sh deleted file mode 100644 index ee4b9dde4..000000000 --- a/scripts/install_abci_apps.sh +++ /dev/null @@ -1,12 +0,0 @@ -#! /bin/bash - -# get the abci commit used by tendermint -COMMIT=$(bash scripts/dep_utils/parse.sh abci) -echo "Checking out vendored commit for abci: $COMMIT" - -go get -d github.com/tendermint/tendermint/abci -cd "$GOPATH/src/github.com/tendermint/tendermint/abci" || exit -git checkout "$COMMIT" -make get_tools -make get_vendor_deps -make install diff --git a/test/docker/Dockerfile b/test/docker/Dockerfile index bc211ea43..70570e752 100644 --- a/test/docker/Dockerfile +++ b/test/docker/Dockerfile @@ -21,14 +21,13 @@ ADD Makefile Makefile RUN make get_tools RUN make get_vendor_deps -# Install the apps -ADD scripts scripts -RUN bash scripts/install_abci_apps.sh - # Now copy in the code # NOTE: this will overwrite whatever is in vendor/ COPY . $REPO +# install ABCI CLI +RUN cd abci && make install && cd - + RUN go install ./cmd/tendermint # expose the volume for debugging