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

Jump to bottom

CMake: quote conan revisions #213

Merged
merged 4 commits into from
Feb 2, 2022
Merged

CMake: quote conan revisions #213

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
10e94e7
conan: quote revisions as it otherwise did not take effect
csegarragonz Jan 6, 2022
c5231f8
release: bump code version
csegarragonz Jan 6, 2022
fa6d50e
docs: remove reference to sanitisers yaml file
csegarragonz Jan 6, 2022
5e757ae
Add update to conan install
Shillaker Feb 2, 2022
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
4 changes: 2 additions & 2 deletions .env
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
FAABRIC_VERSION=0.2.3
FAABRIC_CLI_IMAGE=faasm/faabric:0.2.3
FAABRIC_VERSION=0.2.4
FAABRIC_CLI_IMAGE=faasm/faabric:0.2.4
COMPOSE_PROJECT_NAME=faabric-dev
8 changes: 4 additions & 4 deletions .github/workflows/tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:
REDIS_QUEUE_HOST: redis
REDIS_STATE_HOST: redis
container:
image: faasm/faabric:0.2.3
image: faasm/faabric:0.2.4
defaults:
run:
working-directory: /code/faabric
Expand Down Expand Up @@ -64,7 +64,7 @@ jobs:
REDIS_QUEUE_HOST: redis
REDIS_STATE_HOST: redis
container:
image: faasm/faabric:0.2.3
image: faasm/faabric:0.2.4
defaults:
run:
working-directory: /code/faabric
Expand Down Expand Up @@ -101,7 +101,7 @@ jobs:
TSAN_OPTIONS: "verbosity=1:halt_on_error=1:suppressions=/code/faabric/thread-sanitizer-ignorelist.txt:history_size=7"
UBSAN_OPTIONS: "print_stacktrace=1:halt_on_error=1"
container:
image: faasm/faabric:0.2.3
image: faasm/faabric:0.2.4
defaults:
run:
working-directory: /code/faabric
Expand Down Expand Up @@ -190,7 +190,7 @@ jobs:
REDIS_QUEUE_HOST: redis
REDIS_STATE_HOST: redis
container:
image: faasm/faabric:0.2.3
image: faasm/faabric:0.2.4
defaults:
run:
working-directory: /code/faabric
Expand Down
2 changes: 1 addition & 1 deletion VERSION
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
0.2.3
0.2.4
25 changes: 13 additions & 12 deletions cmake/ExternalProjects.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,18 +29,18 @@ endif()

conan_cmake_configure(
REQUIRES
boost/1.77.0@#d0be0b4b04a551f5d49ac540e59f51bd
catch2/2.13.7@#31c8cd08e3c957a9eac8cb1377cf5863
cppcodec/0.2@#f6385611ce2f7cff954ac8b16e25c4fa
cpprestsdk/2.10.18@#36e30936126a3da485ce05d619fb1249
cppzmq/4.8.1@#e0f26b0614b3d812815edc102ce0d881
flatbuffers/2.0.0@#82f5d13594b370c3668bb8abccffc706
hiredis/1.0.2@#297f55bf1e66f8b9c1dc0e7d35e705ab
protobuf/3.17.1@#12f6551f4a57bbd3bf38ff3aad6aaa7e
rapidjson/cci.20200410@#abe3eeacf36801901f6f6d82d124781a
readerwriterqueue/1.0.5@#4232c2ff826eb41e33d8ad8efd3c4c4c
spdlog/1.9.2@#3724602b7b7e843c5e0a687c45e279c9
zeromq/4.3.4@#3b9b0de9c4509784dc92629f3aaf2fe4
"boost/1.77.0@#d0be0b4b04a551f5d49ac540e59f51bd"
"catch2/2.13.7@#31c8cd08e3c957a9eac8cb1377cf5863"
"cppcodec/0.2@#f6385611ce2f7cff954ac8b16e25c4fa"
"cpprestsdk/2.10.18@#36e30936126a3da485ce05d619fb1249"
"cppzmq/4.8.1@#e0f26b0614b3d812815edc102ce0d881"
"flatbuffers/2.0.0@#82f5d13594b370c3668bb8abccffc706"
"hiredis/1.0.2@#297f55bf1e66f8b9c1dc0e7d35e705ab"
"protobuf/3.17.1@#12f6551f4a57bbd3bf38ff3aad6aaa7e"
"rapidjson/cci.20200410@#abe3eeacf36801901f6f6d82d124781a"
"readerwriterqueue/1.0.5@#4232c2ff826eb41e33d8ad8efd3c4c4c"
"spdlog/1.9.2@#3724602b7b7e843c5e0a687c45e279c9"
"zeromq/4.3.4@#3b9b0de9c4509784dc92629f3aaf2fe4"
GENERATORS
cmake_find_package
cmake_paths
Expand Down Expand Up @@ -69,6 +69,7 @@ conan_cmake_autodetect(FAABRIC_CONAN_SETTINGS)

conan_cmake_install(PATH_OR_REFERENCE .
BUILD outdated
UPDATE
REMOTE conancenter
PROFILE_HOST ${CMAKE_CURRENT_LIST_DIR}/../conan-profile.txt
PROFILE_BUILD ${CMAKE_CURRENT_LIST_DIR}/../conan-profile.txt
Expand Down
1 change: 0 additions & 1 deletion docs/development.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,6 @@ bumped version. It should appear in:

- `VERSION`
- `.env`
- `.github/workflows/sanitisers.yml`.
- `.github/workflows/tests.yml`.
- `mpi-native/mpi-native.env`

Expand Down