diff options
| author | Minijackson <minijackson@riseup.net> | 2018-02-27 12:21:29 +0100 |
|---|---|---|
| committer | Minijackson <minijackson@riseup.net> | 2018-02-27 16:14:01 +0100 |
| commit | d624578670b35068c1c01d57361ad27aa7b95445 (patch) | |
| tree | 9b56261ff7fbf87f99fec1bdc4982563ecf2d4f5 | |
| parent | 54410589522ac79133fd1dc4bbe9a9c94092eac3 (diff) | |
| download | kube-d624578670b35068c1c01d57361ad27aa7b95445.tar.gz kube-d624578670b35068c1c01d57361ad27aa7b95445.zip | |
Configure flatbuffers to build shared libs (+ attempt at multi-branch builds)
| -rw-r--r-- | .travis.yml | 3 | ||||
| -rwxr-xr-x | .travis/install-flatbuffers.sh | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/.travis.yml b/.travis.yml index 87dbdfce..030efe53 100644 --- a/.travis.yml +++ b/.travis.yml | |||
| @@ -21,6 +21,9 @@ addons: | |||
| 21 | - libxapian-dev | 21 | - libxapian-dev |
| 22 | git: | 22 | git: |
| 23 | depth: 1 | 23 | depth: 1 |
| 24 | branches: | ||
| 25 | except: | ||
| 26 | - gh-pages | ||
| 24 | 27 | ||
| 25 | before_install: | 28 | before_install: |
| 26 | - source /opt/qt59/bin/qt59-env.sh | 29 | - source /opt/qt59/bin/qt59-env.sh |
diff --git a/.travis/install-flatbuffers.sh b/.travis/install-flatbuffers.sh index f97248c7..1ff8fcc2 100755 --- a/.travis/install-flatbuffers.sh +++ b/.travis/install-flatbuffers.sh | |||
| @@ -6,7 +6,7 @@ tar xvfa /tmp/flatbuffers.tar.gz | |||
| 6 | cd flatbuffers-1.8.0 | 6 | cd flatbuffers-1.8.0 |
| 7 | mkdir build | 7 | mkdir build |
| 8 | cd build | 8 | cd build |
| 9 | cmake .. -G Ninja -DCMAKE_INSTALL_PREFIX=/usr | 9 | cmake .. -G Ninja -DCMAKE_INSTALL_PREFIX=/usr -DFLATBUFFERS_BUILD_SHAREDLIB=ON |
| 10 | ninja && sudo ninja install | 10 | ninja && sudo ninja install |
| 11 | cd | 11 | cd |
| 12 | rm -rf /tmp/flatbuffers.tar.gz /tmp/flatbuffers-1.8.0 | 12 | rm -rf /tmp/flatbuffers.tar.gz /tmp/flatbuffers-1.8.0 |