Skip to content

Commit

Permalink
[infra] Update to catch2 3.5.0 (#1177)
Browse files Browse the repository at this point in the history
  • Loading branch information
cqc-alec authored Dec 14, 2023
1 parent 248c1ec commit 7f04263
Show file tree
Hide file tree
Showing 9 changed files with 14 additions and 14 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/build-without-conan.yml
Original file line number Diff line number Diff line change
Expand Up @@ -74,9 +74,9 @@ jobs:
- name: Install catch2
run: |
cd ${TMP_DIR}
wget https://github.com/catchorg/Catch2/archive/refs/tags/v3.3.2.tar.gz
tar xzvf v3.3.2.tar.gz
cd Catch2-3.3.2/
wget https://github.com/catchorg/Catch2/archive/refs/tags/v3.5.0.tar.gz
tar xzvf v3.5.0.tar.gz
cd Catch2-3.5.0/
mkdir build
cd build
cmake -GNinja -DCMAKE_INSTALL_PREFIX=${INSTALL_DIR} ..
Expand Down
6 changes: 3 additions & 3 deletions build-without-conan.md
Original file line number Diff line number Diff line change
Expand Up @@ -91,9 +91,9 @@ cmake --install .
```
cd ${TMP_DIR}
wget https://github.com/catchorg/Catch2/archive/refs/tags/v3.3.2.tar.gz
tar xzvf v3.3.2.tar.gz
cd Catch2-3.3.2/
wget https://github.com/catchorg/Catch2/archive/refs/tags/v3.5.0.tar.gz
tar xzvf v3.5.0.tar.gz
cd Catch2-3.5.0/
mkdir build
cd build
cmake -DCMAKE_INSTALL_PREFIX=${INSTALL_DIR} ..
Expand Down
2 changes: 1 addition & 1 deletion libs/tkassert/test/conanfile.py
Original file line number Diff line number Diff line change
Expand Up @@ -60,4 +60,4 @@ def package(self):

def requirements(self):
self.requires("tkassert/0.3.4")
self.requires("catch2/3.3.2")
self.requires("catch2/3.5.0")
2 changes: 1 addition & 1 deletion libs/tklog/test/conanfile.py
Original file line number Diff line number Diff line change
Expand Up @@ -60,4 +60,4 @@ def package(self):

def requirements(self):
self.requires("tklog/0.3.3")
self.requires("catch2/3.3.2")
self.requires("catch2/3.5.0")
2 changes: 1 addition & 1 deletion libs/tkrng/test/conanfile.py
Original file line number Diff line number Diff line change
Expand Up @@ -60,4 +60,4 @@ def package(self):

def requirements(self):
self.requires("tkrng/0.3.3")
self.requires("catch2/3.3.2")
self.requires("catch2/3.5.0")
2 changes: 1 addition & 1 deletion libs/tktokenswap/test/conanfile.py
Original file line number Diff line number Diff line change
Expand Up @@ -61,4 +61,4 @@ def package(self):
def requirements(self):
self.requires("tktokenswap/0.3.6")
self.requires("tkrng/0.3.3@tket/stable")
self.requires("catch2/3.3.2")
self.requires("catch2/3.5.0")
2 changes: 1 addition & 1 deletion libs/tkwsm/test/conanfile.py
Original file line number Diff line number Diff line change
Expand Up @@ -62,4 +62,4 @@ def requirements(self):
self.requires("tkwsm/0.3.6")
self.requires("tkassert/0.3.4@tket/stable")
self.requires("tkrng/0.3.3@tket/stable")
self.requires("catch2/3.3.2")
self.requires("catch2/3.5.0")
2 changes: 1 addition & 1 deletion pytket/conanfile.py
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ def package(self):
cmake.install()

def requirements(self):
self.requires("tket/1.2.74@tket/stable")
self.requires("tket/1.2.75@tket/stable")
self.requires("tklog/0.3.3@tket/stable")
self.requires("tkrng/0.3.3@tket/stable")
self.requires("tkassert/0.3.4@tket/stable")
Expand Down
4 changes: 2 additions & 2 deletions tket/conanfile.py
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@

class TketConan(ConanFile):
name = "tket"
version = "1.2.74"
version = "1.2.75"
package_type = "library"
license = "Apache 2"
homepage = "https://github.com/CQCL/tket"
Expand Down Expand Up @@ -121,7 +121,7 @@ def requirements(self):
self.requires("tktokenswap/0.3.6@tket/stable")
self.requires("tkwsm/0.3.6@tket/stable")
if self.build_test():
self.test_requires("catch2/3.3.2")
self.test_requires("catch2/3.5.0")
if self.build_proptest():
self.test_requires("rapidcheck/cci.20220514")

Expand Down

0 comments on commit 7f04263

Please sign in to comment.