Skip to content

Commit

Permalink
Update install tasks
Browse files Browse the repository at this point in the history
  • Loading branch information
kgryte committed Jan 28, 2017
1 parent d24be2f commit 4e19608
Showing 1 changed file with 2 additions and 20 deletions.
22 changes: 2 additions & 20 deletions tools/ci/circle/script
Original file line number Diff line number Diff line change
Expand Up @@ -156,12 +156,12 @@ clean_node() {
return 0
}

# Installs dependencies.
# Performs install tasks.
#
# $1 - log file
install() {
echo 'Installing...' >&2
make install >> "$1" 2>&1
make C_COMPILER=gcc FORTRAN_COMPILER=gfortran install >> "$1" 2>&1
if [[ "$?" -ne 0 ]]; then
echo 'Error occurred during install.' >&2
return 1
Expand All @@ -170,20 +170,6 @@ install() {
return 0
}

# Builds add-ons.
#
# $1 - log file
build_addons() {
echo 'Building add-ons...' >&2
make C_COMPILER=gcc FORTRAN_COMPILER=gfortran install-addons >> "$1" 2>&1
if [[ "$?" -ne 0 ]]; then
echo 'Error occurred when building add-ons.' >&2
return 1
fi
echo 'Building add-ons successful.' >&2
return 0
}

# Initializes the Node.js environment.
#
# $1 - Node.js version
Expand All @@ -201,10 +187,6 @@ init() {
if [[ "$?" -ne 0 ]]; then
return 1
fi
build_addons "$2"
if [[ "$?" -ne 0 ]]; then
return 1
fi
return 0
}

Expand Down

0 comments on commit 4e19608

Please sign in to comment.