diff options
| author | Jussi Pakkanen <jpakkane@gmail.com> | 2017-05-03 18:27:29 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-05-03 18:27:29 +0300 |
| commit | 2bb03f19fd9842d8c7966336ee967786f8edfbda (patch) | |
| tree | 707f00e4b355d30c6d4d0de23e3364bf82b6c35d /docs/markdown/Continuous-Integration.md | |
| parent | 33b79dcf2502420c0db806fece1b35c724366f40 (diff) | |
| parent | 276d342ebaf859dd53e145ead3e98e2cebb360ab (diff) | |
| download | meson-2bb03f19fd9842d8c7966336ee967786f8edfbda.zip meson-2bb03f19fd9842d8c7966336ee967786f8edfbda.tar.gz meson-2bb03f19fd9842d8c7966336ee967786f8edfbda.tar.bz2 | |
Merge pull request #1725 from whot/master
documentation fixes
Diffstat (limited to 'docs/markdown/Continuous-Integration.md')
| -rw-r--r-- | docs/markdown/Continuous-Integration.md | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/docs/markdown/Continuous-Integration.md b/docs/markdown/Continuous-Integration.md index 1dff200..e57ea78 100644 --- a/docs/markdown/Continuous-Integration.md +++ b/docs/markdown/Continuous-Integration.md @@ -33,8 +33,8 @@ script: - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then echo FROM YOUR/REPO:yakkety > Dockerfile; fi - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then echo ADD . /root >> Dockerfile; fi - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then docker build -t withgit .; fi - - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then docker run withgit /bin/sh -c "cd /root && TRAVIS=true CC=$CC CXX=$CXX meson build && ninja -C build test"; fi - - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then SDKROOT=$(xcodebuild -version -sdk macosx Path) meson build && ninja -C build test; fi + - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then docker run withgit /bin/sh -c "cd /root && TRAVIS=true CC=$CC CXX=$CXX meson builddir && ninja -C builddir test"; fi + - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then SDKROOT=$(xcodebuild -version -sdk macosx Path) meson builddir && ninja -C builddir test; fi ``` ## AppVeyor for Windows @@ -67,11 +67,11 @@ install: build_script: - cmd: echo Building on %arch% with %compiler% - - cmd: PATH=%cd%;%MESON_PYTHON_PATH%;%PATH%; && python meson.py --backend=ninja build - - cmd: PATH=%cd%;%MESON_PYTHON_PATH%;%PATH%; && ninja -C build + - cmd: PATH=%cd%;%MESON_PYTHON_PATH%;%PATH%; && python meson.py --backend=ninja builddir + - cmd: PATH=%cd%;%MESON_PYTHON_PATH%;%PATH%; && ninja -C builddir test_script: - - cmd: PATH=%cd%;%MESON_PYTHON_PATH%;%PATH%; && ninja -C build test + - cmd: PATH=%cd%;%MESON_PYTHON_PATH%;%PATH%; && ninja -C builddir test ``` ## Travis without Docker @@ -96,7 +96,7 @@ install: - pip3 install meson script: - - meson build - - ninja -C build - - ninja -C build test + - meson builddir + - ninja -C builddir + - ninja -C builddir test ``` |