Skip to content

get_deps: use deps directory by default rather than platform specific #78

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

get_deps: use deps directory by default rather than platform specific #78

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .circleci/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ jobs:
sudo ln -s /home/circleci/project/cmake-bin/bin/cmake /usr/local/bin/cmake
echo `cmake --version`
rm -rf /home/circleci/project/deps
DEPS_DIRECTORY=deps bash get_deps.sh cpu
bash get_deps.sh cpu
git clone git://github.com/antirez/redis.git --branch 5.0
(cd redis && make malloc=libc -j4 && sudo make install)

Expand Down
6 changes: 1 addition & 5 deletions get_deps.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,9 @@ set -x
BASE_DIRECTORY=`pwd`

# Allow different deps for different platforms:
PLATNAME=${OSTYPE}
if [ -e /etc/debian-version ]; then
PLATNAME=${PLATNAME}-deb
fi

if [ -z "$DEPS_DIRECTORY" ]; then
DEPS_DIRECTORY=${BASE_DIRECTORY}/deps-${PLATNAME}
DEPS_DIRECTORY=${BASE_DIRECTORY}/deps
fi

mkdir -p ${DEPS_DIRECTORY}
Expand Down