From a00781ca4644b1be50aae7fae7102d175f4578cc Mon Sep 17 00:00:00 2001 From: Michael Baentsch <57787676+baentsch@users.noreply.github.com> Date: Thu, 9 Apr 2020 19:45:53 +0200 Subject: [PATCH] add IBM Research attribution; limit Win-testing to mb-* branches (#711) --- .circleci/config.yml | 12 ++++++++++-- README.md | 2 +- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 65f826efd2..e50ce8a3c8 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -211,7 +211,16 @@ workflows: version: 2 build: jobs: - - win-shared + - win-static: + filters: + branches: + only: + - /mb-.*/ + - win-shared: + filters: + branches: + only: + - /mb-.*/ - centos-7-amd64 - centos-8-amd64 - debian-buster-amd64 @@ -235,7 +244,6 @@ 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 diff --git a/README.md b/README.md index c2a8e2963f..185126ec1d 100644 --- a/README.md +++ b/README.md @@ -183,7 +183,7 @@ liboqs includes some third party libraries or modules that are licensed differen ## Acknowledgements -Various companies, including Amazon Web Services, evolutionQ, Microsoft Research, and Cisco Systems, have dedicated programmer time to contribute source code to OQS. [Various people](CONTRIBUTORS) have contributed source code to liboqs. +Various companies, including Amazon Web Services, evolutionQ, Microsoft Research, Cisco Systems, and IBM Research have dedicated programmer time to contribute source code to OQS. [Various people](CONTRIBUTORS) have contributed source code to liboqs. Financial support for the development of Open Quantum Safe has been provided by Amazon Web Services and the Tutte Institute for Mathematics and Computing. Research projects which developed specific components of OQS have been supported by various research grants, including funding from the Natural Sciences and Engineering Research Council of Canada (NSERC); see the source papers for funding acknowledgments.