diff options
| author | Eli Schwartz <eschwartz@archlinux.org> | 2022-08-16 16:12:35 -0400 |
|---|---|---|
| committer | Eli Schwartz <eschwartz@archlinux.org> | 2022-08-16 16:18:18 -0400 |
| commit | 25b0988d4e40d22d907169b4f73ff07b4cb7fd0e (patch) | |
| tree | b5cdc4588cc1856a00126fb28d09b4fbd1bb9079 /docs/markdown/Continuous-Integration.md | |
| parent | 33a5352e3c56c3d245aed48005515f097ab2ab53 (diff) | |
| download | meson-25b0988d4e40d22d907169b4f73ff07b4cb7fd0e.zip meson-25b0988d4e40d22d907169b4f73ff07b4cb7fd0e.tar.gz meson-25b0988d4e40d22d907169b4f73ff07b4cb7fd0e.tar.bz2 | |
docs: fix various references to "meson builddir"
This is wrong, it should use "meson setup builddir".
Diffstat (limited to 'docs/markdown/Continuous-Integration.md')
| -rw-r--r-- | docs/markdown/Continuous-Integration.md | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/docs/markdown/Continuous-Integration.md b/docs/markdown/Continuous-Integration.md index ec0b4e0..0d787d2 100644 --- a/docs/markdown/Continuous-Integration.md +++ b/docs/markdown/Continuous-Integration.md @@ -36,8 +36,8 @@ script: - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then echo FROM YOUR/REPO:eoan > 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 builddir && meson test -C builddir"; fi - - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then SDKROOT=$(xcodebuild -version -sdk macosx Path) meson builddir && meson test -C builddir; fi + - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then docker run withgit /bin/sh -c "cd /root && TRAVIS=true CC=$CC CXX=$CXX meson setup builddir && meson test -C builddir"; fi + - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then SDKROOT=$(xcodebuild -version -sdk macosx Path) meson setup builddir && meson test -C builddir; fi ``` ## CircleCi for Linux (with Docker) @@ -192,7 +192,7 @@ install: - pip install meson ninja script: - - meson builddir + - meson setup builddir - meson compile -C builddir - meson test -C builddir ``` |