Skip to content

Commit

Permalink
merge develop
Browse files Browse the repository at this point in the history
  • Loading branch information
liss-h authored Aug 20, 2024
2 parents b19d75b + f41989d commit 7be762f
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 7 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/publish-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
os: ubuntu-22.04
compiler: clang-14
cmake-version: 3.24.0
conan-version: 2.0.13
conan-version: 2.3.0
secrets:
CONAN_USER: ${{ secrets.CONAN_USER }}
CONAN_PW: ${{ secrets.CONAN_PW }}
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.24)

project(
dice-hash
VERSION 0.4.6
VERSION 0.4.7
DESCRIPTION "dice-hash provides a framework to generate stable hashes. It provides state-of-the-art hash functions, supports STL containers out of the box and helps you to defines stable hashes for your own structs and classes."
HOMEPAGE_URL "https://dice-group.github.io/dice-hash/")
set(POBR_VERSION 1) # Persisted Object Binary Representation Version
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ To use it with [conan](https://conan.io/) you need to add the repository:
conan remote add dice-group https://conan.dice-research.org/artifactory/api/conan/tentris
```

To use it add `dice-hash/0.4.6` to the `[requires]` section of your conan file.
To use it add `dice-hash/0.4.7` to the `[requires]` section of your conan file.

You can now add it to your target with:
```cmake
Expand Down
7 changes: 3 additions & 4 deletions conanfile.py
Original file line number Diff line number Diff line change
Expand Up @@ -47,10 +47,9 @@ def layout(self):
cmake_layout(self)

def build(self):
if not self.conf.get("tools.build:skip_test", default=False):
cmake = CMake(self)
cmake.configure()
cmake.build()
cmake = CMake(self)
cmake.configure()
cmake.build()

def package_id(self):
self.info.clear()
Expand Down

0 comments on commit 7be762f

Please sign in to comment.