Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump dependencies #106

Merged
merged 9 commits into from
Jan 28, 2024
Merged

Bump dependencies #106

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
424ed27
Bump deps in conanfile.txt
robomics Jan 25, 2024
bb1f890
Bump catch2 to v3.5.2
robomics Jan 25, 2024
f144356
Try to build catch2 with conan
robomics Jan 25, 2024
b96636c
Merge branch 'main' into deps/bump
robomics Jan 28, 2024
ac989b3
Revert bump to boost and highfive
robomics Jan 28, 2024
e491750
Remove unused file
robomics Jan 28, 2024
b0de756
Fix windows builds
robomics Jan 28, 2024
9218c36
Compile all build dependencies from scratch in windows CI
robomics Jan 28, 2024
1f94f9b
Speed up CI by only force-building catch2 from source
robomics Jan 28, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 13 additions & 8 deletions .github/workflows/windows-ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,14 +130,19 @@ jobs:

- name: Install build dependencies
run: |
conan install . \
--build=missing \
-pr:h default \
-pr:b default \
-s "compiler=${{ matrix.compiler-name }}" \
-s "build_type=${{ matrix.build_type }}" \
-s "compiler.runtime_type=${{ matrix.build_type }}" \
-s compiler.cppstd=17 \
conan install . \
--build=missing \
--build="catch2/*" \
-pr:h default \
-pr:b default \
-s:h "compiler=${{ matrix.compiler-name }}" \
-s:h "build_type=${{ matrix.build_type }}" \
-s:h "compiler.runtime_type=${{ matrix.build_type }}" \
-s:h compiler.cppstd=17 \
-s:b "compiler=${{ matrix.compiler-name }}" \
-s:b "build_type=${{ matrix.build_type }}" \
-s:b "compiler.runtime_type=${{ matrix.build_type }}" \
-s:b compiler.cppstd=17 \
--output-folder=build

- name: Clean Conan cache (post-build)
Expand Down
9 changes: 5 additions & 4 deletions conanfile.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,20 +3,21 @@
# SPDX-License-Identifier: MIT

[requires]
boost/1.83.0#7825569cd0622461dec7bc87dfdf47ae
boost/1.83.0#39551a6ba03b4fe2c7a86b9a6d80cd67
bshoshany-thread-pool/3.5.0#5aaea7ccf37107d3c1ba9ca9ab246e42
concurrentqueue/1.0.4#1e48e1c712bcfd892087c9c622a51502
catch2/3.5.2#9554dc3c4ffcab50daf8f2cac4b79308
cli11/2.3.2#1424b9b1d9e3682a7122f415b078b4d7
concurrentqueue/1.0.4#1e48e1c712bcfd892087c9c622a51502
eigen/3.4.0#2e192482a8acff96fe34766adca2b24c
fast_float/6.0.0#6c8a953c57879453982a6ce69c0ba87c
fmt/10.1.1#cd63809a79574a2f9eb73ca35f16a243
fmt/10.2.1#9199a7a0611866dea5c8849a77467b25
hdf5/1.14.3#31ccd8d4de83844f5db48471df1944a1
highfive/2.8.0#b1de99f678ff5699cce6fb5fcac44d2d
libdeflate/1.19#3ea74a4549efc14d4b1202dc4bfbf602
parallel-hashmap/1.3.11#1e67f4855a3f7cdeb977cc472113baf7
readerwriterqueue/1.0.6#aaa5ff6fac60c2aee591e9e51b063b83
span-lite/0.10.3#1967d71abb32b314387c2ab9c558dd22
spdlog/1.12.0#0e390a2f5c3e96671d0857bc734e4731
spdlog/1.13.0#2775cc949e26b339029a852785b6b276
zstd/1.5.5#b87dc3b185caa4b122979ac4ae8ef7e8

[generators]
Expand Down
Binary file removed external/catch2-v3.4.0.tar.xz
View file
Open in desktop
Binary file not shown.
12 changes: 0 additions & 12 deletions test/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,18 +2,6 @@
#
# SPDX-License-Identifier: MIT

FetchContent_Declare(
_hictk_catch2
URL ${PROJECT_SOURCE_DIR}/external/catch2-v3.4.0.tar.xz
URL_HASH SHA256=757d1b29b836e2c816784e062785e57ad852317de6242465129d4acb65b58b4d
EXCLUDE_FROM_ALL SYSTEM)

FetchContent_MakeAvailable(_hictk_catch2)
target_disable_clang_tidy(Catch2)
target_disable_clang_tidy(Catch2WithMain)

list(APPEND CMAKE_MODULE_PATH ${_hictk_catch2_SOURCE_DIR}/extras)

add_subdirectory(units)
add_subdirectory(utils)

Expand Down
1 change: 1 addition & 0 deletions test/units/balancing/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@

find_package(Filesystem REQUIRED)

find_package(Catch2 REQUIRED)
include(CTest)
include(Catch)

Expand Down
1 change: 1 addition & 0 deletions test/units/bin_table/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
# SPDX-License-Identifier: MIT

find_package(Filesystem REQUIRED)
find_package(Catch2 REQUIRED)
find_package(fmt REQUIRED)

include(CTest)
Expand Down
1 change: 1 addition & 0 deletions test/units/chromosome/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@

find_package(Filesystem REQUIRED)

find_package(Catch2 REQUIRED)
include(CTest)
include(Catch)

Expand Down
1 change: 1 addition & 0 deletions test/units/cooler/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@

find_package(Filesystem REQUIRED)

find_package(Catch2 REQUIRED)
include(CTest)
include(Catch)

Expand Down
1 change: 1 addition & 0 deletions test/units/file/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@

find_package(Filesystem REQUIRED)

find_package(Catch2 REQUIRED)
include(CTest)
include(Catch)

Expand Down
1 change: 1 addition & 0 deletions test/units/hic/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@

find_package(Filesystem REQUIRED)

find_package(Catch2 REQUIRED)
include(CTest)
include(Catch)

Expand Down
1 change: 1 addition & 0 deletions test/units/pixel/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@

find_package(Filesystem REQUIRED)

find_package(Catch2 REQUIRED)
include(CTest)
include(Catch)

Expand Down
1 change: 1 addition & 0 deletions test/units/reference/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@

find_package(Filesystem REQUIRED)

find_package(Catch2 REQUIRED)
include(CTest)
include(Catch)

Expand Down
1 change: 1 addition & 0 deletions test/units/transformers/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@

find_package(Filesystem REQUIRED)

find_package(Catch2 REQUIRED)
include(CTest)
include(Catch)

Expand Down
1 change: 1 addition & 0 deletions test/units/variant/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@

find_package(Filesystem REQUIRED)

find_package(Catch2 REQUIRED)
include(CTest)
include(Catch)

Expand Down