Skip to content

Commit

Permalink
CircleCI testing for Windows (open-quantum-safe#690)
Browse files Browse the repository at this point in the history
* enable Windows testing on CircleCI

* full CCI enabled (incl. Win)

* trigger AppVeyor build
  • Loading branch information
baentsch authored Apr 8, 2020
1 parent 9466677 commit 7419141
Show file tree
Hide file tree
Showing 2 changed files with 47 additions and 1 deletion.
47 changes: 46 additions & 1 deletion .circleci/config.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
version: 2
version: 2.1

orbs:
win: circleci/[email protected]

# CircleCI doesn't handle large file sets properly for local builds
# https://github.com/CircleCI-Public/circleci-cli/issues/281#issuecomment-472808051
Expand Down Expand Up @@ -57,6 +60,36 @@ localCheckout: &localCheckout
- store_artifacts:
path: build/test-results

.winjob: &winjob
executor:
name: win/default
steps:
- checkout
- run:
name: Install ninja
command: $ProgressPreference="SilentlyContinue" ; Invoke-RestMethod -Uri https://github.com/ninja-build/ninja/releases/download/v1.10.0/ninja-win.zip -Method Get -OutFile ninja.zip; Expand-Archive ninja.zip
shell: powershell.exe
- run:
name: Install dependencies
command: |
scripts/git_no_checkin_in_last_day.sh || (
pip install pytest pytest-xdist
)
shell: bash.exe
- run:
name: Configure & Build
command: PATH=C:\Users\circleci\project\ninja;%PATH% & call C:\PROGRA~2\MICROS~2\2019\Community\VC\Auxiliary\Build\vcvars64.bat & mkdir build & cd build & cmake -GNinja ${CONFIGURE_ARGS} .. & ninja
shell: cmd.exe
- run:
name: Run tests
command: PATH=C:\Users\circleci\project\ninja;%PATH% & ninja run_tests
working_directory: build
shell: cmd.exe
- store_test_results: # Note that this command will fail when running CircleCI locally, that is expected behaviour
path: build/test-results
- store_artifacts:
path: build/test-results

jobs:
centos-7-amd64:
<<: *oqsjob
Expand Down Expand Up @@ -163,11 +196,22 @@ jobs:
path: build/test-results
- store_artifacts:
path: build/test-results
win-static:
<<: *winjob
environment:
CONFIGURE_ARGS: -DOQS_USE_OPENSSL=OFF
SKIP_TESTS: style
win-shared:
<<: *winjob
environment:
CONFIGURE_ARGS: -DOQS_USE_OPENSSL=OFF -DBUILD_SHARED_LIBS=ON
SKIP_TESTS: style

workflows:
version: 2
build:
jobs:
- win-shared
- centos-7-amd64
- centos-8-amd64
- debian-buster-amd64
Expand All @@ -191,6 +235,7 @@ workflows:
- debian-buster-armhf
- debian-buster-armel
- macOS
- win-static
- ubuntu-bionic-x86_64-gcc7
- ubuntu-bionic-x86_64-gcc7-noopenssl
- ubuntu-bionic-x86_64-gcc7-shared
Expand Down
1 change: 1 addition & 0 deletions src/common/common.h
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
* \brief Utility functions for use in liboqs.
*/


#ifndef OQS_COMMON_H
#define OQS_COMMON_H

Expand Down

0 comments on commit 7419141

Please sign in to comment.