diff options
| author | Kitsune Ral <Kitsune-Ral@users.sf.net> | 2020-06-06 21:25:14 +0200 |
|---|---|---|
| committer | Kitsune Ral <Kitsune-Ral@users.sf.net> | 2020-06-07 19:47:34 +0200 |
| commit | 4ff89aa1ec48623264944f18f97cd92115268eaf (patch) | |
| tree | edab755c24446429dbad81cc608e3dd3cddee7e5 | |
| parent | 32729d9a7519cd2c4cddb0174b8329c6fd4a4a83 (diff) | |
| download | libquotient-4ff89aa1ec48623264944f18f97cd92115268eaf.tar.gz libquotient-4ff89aa1ec48623264944f18f97cd92115268eaf.zip | |
Travis CI: clone olm and gtad outside of source tree
libQuotient now has gtad/ directory that stands in the way of cloning
GTAD - which is just to emphasize that cloning other projects into
the source tree has never been a good idea.
| -rw-r--r-- | .travis.yml | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/.travis.yml b/.travis.yml index d3f4711f..9eed9949 100644 --- a/.travis.yml +++ b/.travis.yml @@ -48,7 +48,7 @@ before_install: - | if [ -n "$UPDATE_API" ]; then export CC=gcc-8 CXX=g++-8 - export CMAKE_UPDATE_API_ARGS="-DMATRIX_DOC_PATH=matrix-doc -DGTAD_PATH=gtad/gtad" + export CMAKE_UPDATE_API_ARGS="-DMATRIX_DOC_PATH=../matrix-doc -DGTAD_PATH=../gtad/gtad" fi # RPM spec-style: swallow a command with default parameters into an alias # and add/override parameters further in the code if/as necessary @@ -57,6 +57,7 @@ before_install: - alias _cmake_build='cmake --build build' install: +- pushd .. # Go out of libQuotient source tree - git clone https://gitlab.matrix.org/matrix-org/olm.git - pushd olm - _cmake_config @@ -65,13 +66,14 @@ install: - | if [ -n "$UPDATE_API" ]; then - git clone https://github.com/quotient-im/matrix-doc.git + git clone https://github.com/matrix.org/matrix-doc.git git clone --recursive https://github.com/KitsuneRal/gtad.git pushd gtad cmake $CMAKE_ARGS . cmake --build . popd fi +- popd # back to libQuotient source tree before_script: - _cmake_config $CMAKE_UPDATE_API_ARGS $E2EE |