From 2abc00693cc99f277c7c8fe1a201ec33becb01f1 Mon Sep 17 00:00:00 2001 From: iphydf Date: Sun, 16 Sep 2018 13:58:57 +0000 Subject: 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. --- .circleci/config.yml | 43 ++++++++++++++++++++++--------------------- 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 @@ +--- version: 2 workflows: version: 2 build_linux: jobs: - - asan - - tsan + - asan + - tsan jobs: asan: working_directory: ~/work docker: - - image: ubuntu + - image: ubuntu steps: - - checkout - - run: &apt_install - apt update && - apt install -y --no-install-recommends - clang - cmake - libconfig-dev - libgtest-dev - libopus-dev - libsodium-dev - libvpx-dev - ninja-build - pkg-config - - run: CC=clang .circleci/cmake-asan + - checkout + - run: &apt_install + apt update && + apt install -y --no-install-recommends + clang + cmake + libconfig-dev + libgtest-dev + libopus-dev + libsodium-dev + libvpx-dev + ninja-build + pkg-config + - run: CC=clang .circleci/cmake-asan tsan: working_directory: ~/work docker: - - image: ubuntu + - image: ubuntu steps: - - checkout - - run: *apt_install - - run: CC=clang .circleci/cmake-tsan + - checkout + - run: *apt_install + - 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 @@ +--- cache: -- '%APPDATA%\downloads' + - '%APPDATA%\downloads' install: -# TODO(iphydf): Remove this when appveyor gets curl back, which it should have -# according to https://www.appveyor.com/docs/how-to/download-file/. -- choco install curl -- refreshenv -- if not exist %APPDATA%\downloads mkdir %APPDATA%\downloads -- cd third_party -# libsodium -- mkdir libsodium && cd libsodium -- 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 -- unzip %APPDATA%\downloads\libsodium.zip -- cd .. -# pthreads-win32 -- mkdir pthreads-win32 && cd pthreads-win32 -- 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 -- unzip %APPDATA%\downloads\pthreads.zip -- cd ../.. + # TODO(iphydf): Remove this when appveyor gets curl back, which it should + # have according to https://www.appveyor.com/docs/how-to/download-file/. + - choco install curl + - refreshenv + - if not exist %APPDATA%\downloads mkdir %APPDATA%\downloads + - cd third_party + # libsodium + - mkdir libsodium && cd libsodium + - 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 + - unzip %APPDATA%\downloads\libsodium.zip + - cd .. + # pthreads-win32 + - mkdir pthreads-win32 && cd pthreads-win32 + - 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 + - unzip %APPDATA%\downloads\pthreads.zip + - cd ../.. before_build: -- cmake . -DBOOTSTRAP_DAEMON=OFF -DENABLE_SHARED=OFF -DBUILD_TOXAV=OFF + - cmake . -DBOOTSTRAP_DAEMON=OFF -DENABLE_SHARED=OFF -DBUILD_TOXAV=OFF build: project: INSTALL.vcxproj # TODO(iphydf): Tests all segfault on Windows at the moment. -#test_script: -#- ctest -C Debug - -branches: - only: - - master +# test_script: +# - ctest -C Debug -- cgit v1.2.3