diff options
| author | Emilio Jesus Gallego Arias | 2018-09-01 01:56:30 +0200 |
|---|---|---|
| committer | Emilio Jesus Gallego Arias | 2018-09-01 01:56:30 +0200 |
| commit | 6f1c4ac389e595e09fdf4653847d8c3ccca0befb (patch) | |
| tree | 948a6a1ea0328b01925d7ee9120a82cc3d14317c /dev/ci/ci-ext-lib.sh | |
| parent | 166a3838a7f07df4181617e111ffeb67dd817929 (diff) | |
| parent | 04542c3288b838c57253f2c315f1dab028412a40 (diff) | |
Merge PR #8348: Download tarball instead of cloning external projects.
Diffstat (limited to 'dev/ci/ci-ext-lib.sh')
| -rwxr-xr-x | dev/ci/ci-ext-lib.sh | 14 |
1 files changed, 3 insertions, 11 deletions
diff --git a/dev/ci/ci-ext-lib.sh b/dev/ci/ci-ext-lib.sh index cf212c2fb5..5eb167d97d 100755 --- a/dev/ci/ci-ext-lib.sh +++ b/dev/ci/ci-ext-lib.sh @@ -1,16 +1,8 @@ #!/usr/bin/env bash ci_dir="$(dirname "$0")" +. "${ci_dir}/ci-common.sh" -# This script could be included inside other ones -# Let's avoid to source ci-common twice in this case -if [ -z "${CI_BUILD_DIR}" ]; -then - . "${ci_dir}/ci-common.sh" -fi +git_download ext_lib -ext_lib_CI_DIR="${CI_BUILD_DIR}/ExtLib" - -git_checkout "${ext_lib_CI_BRANCH}" "${ext_lib_CI_GITURL}" "${ext_lib_CI_DIR}" - -( cd "${ext_lib_CI_DIR}" && make && make install) +( cd "${CI_BUILD_DIR}/ext_lib" && make && make install) |