From d1052c8800f06b570dd5ab38f84a2ec74e97c9a2 Mon Sep 17 00:00:00 2001 From: Robert Prehn Date: Thu, 2 Jul 2020 19:39:53 -0500 Subject: [PATCH] chore: Do not call bootstrap or update from ci build --- script/bootstrap | 17 +++++++++++------ script/cibuild | 5 +---- 2 files changed, 12 insertions(+), 10 deletions(-) diff --git a/script/bootstrap b/script/bootstrap index a1e0d7af..91aaf9b5 100755 --- a/script/bootstrap +++ b/script/bootstrap @@ -12,14 +12,19 @@ else export KERL_CONFIGURE_OPTIONS="--disable-hipe --with-ssl=$(brew --prefix openssl)" fi -export CFLAGS="-O2 -g -fno-stack-check" +if ! asdf -v &> /dev/null +then + echo "WARNING: No asdf. Skipping erlang, elixir, node installation." +else + export CFLAGS="-O2 -g -fno-stack-check" -asdf plugin-add elixir || true -asdf plugin-add erlang || true -asdf plugin-add nodejs || true + asdf plugin-add elixir || true + asdf plugin-add erlang || true + asdf plugin-add nodejs || true -${ASDF_DATA_DIR:=$HOME/.asdf}/plugins/nodejs/bin/import-release-team-keyring + ${ASDF_DATA_DIR:=$HOME/.asdf}/plugins/nodejs/bin/import-release-team-keyring -asdf install + asdf install +fi mix local.hex --force diff --git a/script/cibuild b/script/cibuild index 299d478b..ae3b27ea 100755 --- a/script/cibuild +++ b/script/cibuild @@ -3,9 +3,6 @@ set -x set -e -FULL_PATH=$(realpath $0) -DIR_PATH=$(dirname $FULL_PATH) - mix local.hex --force mix deps.get -$DIR_PATH/test \ No newline at end of file +mix test \ No newline at end of file