diff --git a/README.md b/README.md index 2e6950f269..b6733fa2fa 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -[AppVeyor](https://ci.appveyor.com/project/dstebila/liboqs): ![Build status image](https://ci.appveyor.com/api/projects/status/9d2ts78x88r8wnii/branch/main?svg=true), [CircleCI](https://circleci.com/gh/open-quantum-safe/liboqs/tree/main): ![Build status image](https://circleci.com/gh/open-quantum-safe/liboqs/tree/main.svg?style=svg), [TravisCI](https://travis-ci.com/github/open-quantum-safe/liboqs): [![Build Status](https://travis-ci.com/open-quantum-safe/liboqs.svg?branch=main)](https://travis-ci.com/open-quantum-safe/liboqs) +[CircleCI](https://circleci.com/gh/open-quantum-safe/liboqs/tree/main): ![Build status image](https://circleci.com/gh/open-quantum-safe/liboqs/tree/main.svg?style=svg), [TravisCI](https://travis-ci.com/github/open-quantum-safe/liboqs): [![Build Status](https://travis-ci.com/open-quantum-safe/liboqs.svg?branch=main)](https://travis-ci.com/open-quantum-safe/liboqs) liboqs ====================== diff --git a/appveyor.yml b/appveyor.yml deleted file mode 100644 index 5a8f3052b5..0000000000 --- a/appveyor.yml +++ /dev/null @@ -1,66 +0,0 @@ -version: 1.0.{build} - -# TODO: Support Visual Studio 2017 -image: Visual Studio 2019 - -platform: x64 - -branches: - except: - - /main-new-.*/ - - /ghactionsonly-.*/ - -environment: - matrix: - - BUILD_SHARED: ON - COMPILER: cygwin - OQS_ALGS_ENABLED: All - - BUILD_SHARED: OFF - COMPILER: cygwin - OQS_ALGS_ENABLED: STD - - BUILD_SHARED: ON - OQS_USE_OPENSSL: ON - COMPILER: cygwin - OQS_ALGS_ENABLED: NIST_R4 - - BUILD_SHARED: OFF - COMPILER: msvc2019 - OQS_ALGS_ENABLED: NIST_R4 - - BUILD_SHARED: OFF - COMPILER: msvc2019 - OQS_USE_OPENSSL: ON - OQS_ALGS_ENABLED: All - - BUILD_SHARED: ON - COMPILER: msvc2019 - - BUILD_SHARED: OFF - COMPILER: msys2 - - BUILD_SHARED: ON - COMPILER: msys2 - -for: - - matrix: - only: - - OQS_USE_OPENSSL: ON - before_build: - - cmd: |- - choco install openssl - SET "OPENSSL_ROOT_DIR=C:\OpenSSL-Win64" - -build_script: - - cmd: '%APPVEYOR_BUILD_FOLDER%\appveyor_build.bat' - -before_test: - - cmd: |- - SET "PATH=C:\Python37-x64;C:\Python37-x64\Scripts;%PATH%" - pip.exe install pytest pytest-xdist pyyaml - -test_script: - - cmd: |- - cd %APPVEYOR_BUILD_FOLDER% - set PATH=%APPVEYOR_BUILD_FOLDER%\build\bin;c:\cygwin64\bin;%PATH% - if not exist tmp (mkdir tmp) - python -m pytest --numprocesses=auto -vv --maxfail=10 --ignore=tests/test_code_conventions.py --junitxml=build\test-results\pytest\test-results.xml - -after_test: - - ps: |- - $wc = New-Object 'System.Net.WebClient' - $wc.UploadFile("https://ci.appveyor.com/api/testresults/xunit/$($env:APPVEYOR_JOB_ID)", (Resolve-Path .\build\test-results\pytest\test-results.xml)) diff --git a/appveyor_build.bat b/appveyor_build.bat deleted file mode 100644 index b24261bc6a..0000000000 --- a/appveyor_build.bat +++ /dev/null @@ -1,19 +0,0 @@ -@echo off -IF %COMPILER%==cygwin ( - @echo on - SET "PATH=C:\cywin64\bin;c:\cygwin64;%PATH%" - c:\cygwin64\bin\bash.exe -lc "setup-x86_64.exe -qnNdO -R C:/cygwin64 -l C:/cygwin/var/cache/setup -P openssl -P libssl-devel -P ninja -P cmake -P gcc && cd ${APPVEYOR_BUILD_FOLDER} && openssl version && cygcheck -c && pwd && mkdir build && cd build && cmake .. -GNinja -DCMAKE_C_COMPILER=gcc -DOQS_DIST_BUILD=ON -DBUILD_SHARED_LIBS=%BUILD_SHARED% -DOQS_USE_OPENSSL=%OQS_USE_OPENSSL% -DOQS_ALGS_ENABLED=%OQS_ALGS_ENABLED% && ninja " -) -IF %COMPILER%==msys2 ( - @echo on - SET "PATH=C:\msys64\mingw64\bin;%PATH%" - bash -lc "cd ${APPVEYOR_BUILD_FOLDER} && mkdir build && cd build && cmake .. -GNinja -DOQS_DIST_BUILD=ON -DBUILD_SHARED_LIBS=%BUILD_SHARED% -DOQS_USE_OPENSSL=%OQS_USE_OPENSSL% -DOQS_ALGS_ENABLED=%OQS_ALGS_ENABLED% && ninja" -) -IF %COMPILER%==msvc2019 ( - @echo on - CALL "C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Auxiliary\Build\vcvars64.bat" - mkdir build - cd build - cmake .. -GNinja -DOQS_DIST_BUILD=ON -DBUILD_SHARED_LIBS=%BUILD_SHARED% -DOQS_USE_OPENSSL=%OQS_USE_OPENSSL% -DOQS_ALGS_ENABLED=%OQS_ALGS_ENABLED% - ninja -) diff --git a/tests/helpers.py b/tests/helpers.py index a12ebce842..fc22ef809f 100644 --- a/tests/helpers.py +++ b/tests/helpers.py @@ -137,9 +137,6 @@ def get_current_build_dir_name(): def path_to_executable(program_name): path = "." - if sys.platform.startswith("win"): - if 'APPVEYOR_BUILD_FOLDER' not in os.environ: os.environ['APPVEYOR_BUILD_FOLDER'] = "." - path = os.path.join(path, os.environ['APPVEYOR_BUILD_FOLDER']) path = os.path.join(path, get_current_build_dir_name(), "tests") for executable in [ os.path.join(path, program_name), diff --git a/tests/test_cmdline.py b/tests/test_cmdline.py index e146ee063d..5575fd4ffd 100644 --- a/tests/test_cmdline.py +++ b/tests/test_cmdline.py @@ -24,9 +24,6 @@ def test_kem(kem_name): @pytest.mark.parametrize('sig_name', helpers.available_sigs_by_name()) def test_sig(sig_name): if not(helpers.is_sig_enabled_by_name(sig_name)): pytest.skip('Not enabled') - if sys.platform.startswith("win") and 'APPVEYOR' in os.environ: - if 'SPHINCS' in sig_name and ('192f' in sig_name or '192s' in sig_name or '256f' in sig_name or '256s' in sig_name): - pytest.skip('Skipping SPHINCS+ 192s and 256s tests on Windows AppVeyor builds') helpers.run_subprocess( [helpers.path_to_executable('test_sig'), sig_name], )