diff options
author | ROUVREAU Vincent <vincent.rouvreau@inria.fr> | 2021-01-22 10:56:44 +0100 |
---|---|---|
committer | ROUVREAU Vincent <vincent.rouvreau@inria.fr> | 2021-01-22 10:56:44 +0100 |
commit | e4052a5a176ade4fbebfdd782e5f60caf080872d (patch) | |
tree | 27430b66aa4f07f487b7eeeaaccdae5f0cb4b858 /.appveyor.yml | |
parent | acb4fe9736ebaa444fa654aacfccbb7112a9f3fe (diff) | |
parent | 0d4d99efd1ea1c594be14baca0bab714ed172607 (diff) |
Merge master and resolve conflicts
Diffstat (limited to '.appveyor.yml')
-rw-r--r-- | .appveyor.yml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/.appveyor.yml b/.appveyor.yml index c2b140e9..9ff8f157 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -60,7 +60,7 @@ build_script: cd src/python & type setup.py & MSBuild Cython.sln /m /p:Configuration=Release /p:Platform=x64 & - ctest -j 1 --output-on-failure -C Release -E sphinx + ctest -j 1 --output-on-failure -C Release ) else ( MSBuild GUDHIdev.sln /m /p:Configuration=Release /p:Platform=x64 & ctest -j 1 --output-on-failure -C Release -E diff_files |