Skip to content

Commit c75ab21

Browse files
authored
liboqs/master -> liboqs/main and CI refactoring. (#32)
1 parent 8af801e commit c75ab21

File tree

2 files changed

+27
-60
lines changed

2 files changed

+27
-60
lines changed

.circleci/config.yml

Lines changed: 27 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -1,54 +1,33 @@
1-
version: 2
2-
3-
.my_job: &myjob
4-
docker:
5-
- image: ${IMAGE}
6-
general:
7-
branches:
8-
only:
9-
- master
10-
steps:
11-
- checkout
12-
- run:
13-
name: Clone liboqs-master
14-
command: .circleci/git_no_checkin_in_last_day.sh || (cd /root && git clone --branch master --single-branch https://github.com/open-quantum-safe/liboqs)
15-
- run:
16-
name: Build liboqs-master
17-
command: .circleci/git_no_checkin_in_last_day.sh || (cd /root/liboqs && mkdir build && cd build && cmake -GNinja -DBUILD_SHARED_LIBS=ON .. && ninja)
18-
- run:
19-
name: Run liboqs-python unit tests
20-
environment:
21-
PYTHONPATH: /root/project
22-
command: |
23-
export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/root/liboqs/build/lib
24-
mkdir -p test-results && .circleci/git_no_checkin_in_last_day.sh || (python3 -m nose --rednose --verbose --with-xunit --xunit-file=test-results/nosetests.xml)
25-
- store_test_results: # Note that this command will fail when running CircleCI locally, that is expected behaviour
26-
path: test-results
1+
version: 2.1
272

283
jobs:
29-
debian-buster-amd64:
30-
<<: *myjob
31-
environment:
32-
IMAGE: openquantumsafe/ci-debian-buster-amd64:latest
33-
ubuntu-bionic-x86_64:
34-
<<: *myjob
35-
environment:
36-
IMAGE: openquantumsafe/ci-ubuntu-bionic-x86_64:latest
4+
ubuntu_bionic:
5+
description: A template for running liboqs-python tests on an OQS Ubuntu Bionic Docker Image
6+
docker:
7+
- image: openquantumsafe/ci-ubuntu-bionic-x86_64:latest
8+
auth:
9+
username: $DOCKER_LOGIN
10+
password: $DOCKER_PASSWORD
11+
steps:
12+
- checkout # change this from "checkout" to "*localCheckout" when running CircleCI locally
13+
- run:
14+
name: Clone liboqs
15+
command: git clone --branch main --single-branch --depth 1 https://github.com/open-quantum-safe/liboqs.git
16+
working_directory: /root
17+
- run:
18+
name: Build liboqs
19+
command: mkdir build && cd build && cmake .. -G"Ninja" -DBUILD_SHARED_LIBS=ON -DOQS_BUILD_ONLY_LIB=ON && ninja
20+
working_directory: /root/liboqs
21+
- run:
22+
name: Run liboqs-python unit tests
23+
environment:
24+
PYTHONPATH: /root/project
25+
command: env LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/root/liboqs/build/lib python3 -m nose --rednose --verbose
3726

3827
workflows:
39-
version: 2
28+
version: 2.1
4029
build:
4130
jobs:
42-
- debian-buster-amd64
43-
- ubuntu-bionic-x86_64
44-
nightly:
45-
triggers:
46-
- schedule:
47-
cron: "0 1 * * *"
48-
filters:
49-
branches:
50-
only:
51-
- master
52-
jobs:
53-
- debian-buster-amd64
54-
- ubuntu-bionic-x86_64
31+
- ubuntu_bionic:
32+
name: ubuntu-bionic
33+
context: openquantumsafe

.circleci/git_no_checkin_in_last_day.sh

Lines changed: 0 additions & 12 deletions
This file was deleted.

0 commit comments

Comments
 (0)