diff options
author | iphydf <iphydf@users.noreply.github.com> | 2018-09-16 13:58:57 +0000 |
---|---|---|
committer | iphydf <iphydf@users.noreply.github.com> | 2018-09-16 14:47:23 +0000 |
commit | 2abc00693cc99f277c7c8fe1a201ec33becb01f1 (patch) | |
tree | a3cc744be848b2142df009dd9398f92b4f195434 | |
parent | 889e89b3dda722314737c42575c2db4056b3e887 (diff) |
Format yaml files according to yamllint's requirements.
Also remove branch filter for appveyor. We only have a single branch in
every repository. Development happens in forks.
-rw-r--r-- | .circleci/config.yml | 43 | ||||
-rw-r--r-- | appveyor.yml | 45 |
2 files changed, 43 insertions, 45 deletions
diff --git a/.circleci/config.yml b/.circleci/config.yml index 0d204404..2182fefb 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml | |||
@@ -1,40 +1,41 @@ | |||
1 | --- | ||
1 | version: 2 | 2 | version: 2 |
2 | 3 | ||
3 | workflows: | 4 | workflows: |
4 | version: 2 | 5 | version: 2 |
5 | build_linux: | 6 | build_linux: |
6 | jobs: | 7 | jobs: |
7 | - asan | 8 | - asan |
8 | - tsan | 9 | - tsan |
9 | 10 | ||
10 | jobs: | 11 | jobs: |
11 | asan: | 12 | asan: |
12 | working_directory: ~/work | 13 | working_directory: ~/work |
13 | docker: | 14 | docker: |
14 | - image: ubuntu | 15 | - image: ubuntu |
15 | 16 | ||
16 | steps: | 17 | steps: |
17 | - checkout | 18 | - checkout |
18 | - run: &apt_install | 19 | - run: &apt_install |
19 | apt update && | 20 | apt update && |
20 | apt install -y --no-install-recommends | 21 | apt install -y --no-install-recommends |
21 | clang | 22 | clang |
22 | cmake | 23 | cmake |
23 | libconfig-dev | 24 | libconfig-dev |
24 | libgtest-dev | 25 | libgtest-dev |
25 | libopus-dev | 26 | libopus-dev |
26 | libsodium-dev | 27 | libsodium-dev |
27 | libvpx-dev | 28 | libvpx-dev |
28 | ninja-build | 29 | ninja-build |
29 | pkg-config | 30 | pkg-config |
30 | - run: CC=clang .circleci/cmake-asan | 31 | - run: CC=clang .circleci/cmake-asan |
31 | 32 | ||
32 | tsan: | 33 | tsan: |
33 | working_directory: ~/work | 34 | working_directory: ~/work |
34 | docker: | 35 | docker: |
35 | - image: ubuntu | 36 | - image: ubuntu |
36 | 37 | ||
37 | steps: | 38 | steps: |
38 | - checkout | 39 | - checkout |
39 | - run: *apt_install | 40 | - run: *apt_install |
40 | - run: CC=clang .circleci/cmake-tsan | 41 | - run: CC=clang .circleci/cmake-tsan |
diff --git a/appveyor.yml b/appveyor.yml index c921d761..28744535 100644 --- a/appveyor.yml +++ b/appveyor.yml | |||
@@ -1,34 +1,31 @@ | |||
1 | --- | ||
1 | cache: | 2 | cache: |
2 | - '%APPDATA%\downloads' | 3 | - '%APPDATA%\downloads' |
3 | 4 | ||
4 | install: | 5 | install: |
5 | # TODO(iphydf): Remove this when appveyor gets curl back, which it should have | 6 | # TODO(iphydf): Remove this when appveyor gets curl back, which it should |
6 | # according to https://www.appveyor.com/docs/how-to/download-file/. | 7 | # have according to https://www.appveyor.com/docs/how-to/download-file/. |
7 | - choco install curl | 8 | - choco install curl |
8 | - refreshenv | 9 | - refreshenv |
9 | - if not exist %APPDATA%\downloads mkdir %APPDATA%\downloads | 10 | - if not exist %APPDATA%\downloads mkdir %APPDATA%\downloads |
10 | - cd third_party | 11 | - cd third_party |
11 | # libsodium | 12 | # libsodium |
12 | - mkdir libsodium && cd libsodium | 13 | - mkdir libsodium && cd libsodium |
13 | - if not exist %APPDATA%\downloads\libsodium.zip curl -L https://download.libsodium.org/libsodium/releases/libsodium-1.0.16-msvc.zip -o %APPDATA%\downloads\libsodium.zip | 14 | - if not exist %APPDATA%\downloads\libsodium.zip curl -L https://download.libsodium.org/libsodium/releases/libsodium-1.0.16-msvc.zip -o %APPDATA%\downloads\libsodium.zip |
14 | - unzip %APPDATA%\downloads\libsodium.zip | 15 | - unzip %APPDATA%\downloads\libsodium.zip |
15 | - cd .. | 16 | - cd .. |
16 | # pthreads-win32 | 17 | # pthreads-win32 |
17 | - mkdir pthreads-win32 && cd pthreads-win32 | 18 | - mkdir pthreads-win32 && cd pthreads-win32 |
18 | - if not exist %APPDATA%\downloads\pthreads.zip curl -L ftp://sourceware.org/pub/pthreads-win32/pthreads-w32-2-9-1-release.zip -o %APPDATA%\downloads\pthreads.zip | 19 | - if not exist %APPDATA%\downloads\pthreads.zip curl -L ftp://sourceware.org/pub/pthreads-win32/pthreads-w32-2-9-1-release.zip -o %APPDATA%\downloads\pthreads.zip |
19 | - unzip %APPDATA%\downloads\pthreads.zip | 20 | - unzip %APPDATA%\downloads\pthreads.zip |
20 | - cd ../.. | 21 | - cd ../.. |
21 | 22 | ||
22 | before_build: | 23 | before_build: |
23 | - cmake . -DBOOTSTRAP_DAEMON=OFF -DENABLE_SHARED=OFF -DBUILD_TOXAV=OFF | 24 | - cmake . -DBOOTSTRAP_DAEMON=OFF -DENABLE_SHARED=OFF -DBUILD_TOXAV=OFF |
24 | 25 | ||
25 | build: | 26 | build: |
26 | project: INSTALL.vcxproj | 27 | project: INSTALL.vcxproj |
27 | 28 | ||
28 | # TODO(iphydf): Tests all segfault on Windows at the moment. | 29 | # TODO(iphydf): Tests all segfault on Windows at the moment. |
29 | #test_script: | 30 | # test_script: |
30 | #- ctest -C Debug | 31 | # - ctest -C Debug |
31 | |||
32 | branches: | ||
33 | only: | ||
34 | - master | ||