From 10e94e7b53cd080f80e9d851685fea9bd90ecceb Mon Sep 17 00:00:00 2001 From: Carlos Segarra Date: Thu, 6 Jan 2022 10:50:55 +0000 Subject: [PATCH 1/4] conan: quote revisions as it otherwise did not take effect --- cmake/ExternalProjects.cmake | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/cmake/ExternalProjects.cmake b/cmake/ExternalProjects.cmake index 2c675f414..19059b4c6 100644 --- a/cmake/ExternalProjects.cmake +++ b/cmake/ExternalProjects.cmake @@ -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 From c5231f82183d4dd518951f03fecadcde1e5ec8b3 Mon Sep 17 00:00:00 2001 From: Carlos Segarra Date: Thu, 6 Jan 2022 10:56:05 +0000 Subject: [PATCH 2/4] release: bump code version --- .env | 4 ++-- .github/workflows/tests.yml | 8 ++++---- VERSION | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.env b/.env index aafc3e749..d18b7aa1f 100644 --- a/.env +++ b/.env @@ -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 diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index e7900d9f3..23504bc19 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -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 @@ -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 @@ -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 @@ -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 diff --git a/VERSION b/VERSION index 717903969..abd410582 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -0.2.3 +0.2.4 From fa6d50e6f3cc606e78d36d0d55053774cace1787 Mon Sep 17 00:00:00 2001 From: Carlos Segarra Date: Thu, 6 Jan 2022 10:56:18 +0000 Subject: [PATCH 3/4] docs: remove reference to sanitisers yaml file --- docs/development.md | 1 - 1 file changed, 1 deletion(-) diff --git a/docs/development.md b/docs/development.md index f0348185f..533a6614c 100644 --- a/docs/development.md +++ b/docs/development.md @@ -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` From 5e757ae6dac5a55f3160fde0e180e56ecbad5389 Mon Sep 17 00:00:00 2001 From: Simon Shillaker Date: Wed, 2 Feb 2022 15:37:18 +0000 Subject: [PATCH 4/4] Add update to conan install --- cmake/ExternalProjects.cmake | 1 + 1 file changed, 1 insertion(+) diff --git a/cmake/ExternalProjects.cmake b/cmake/ExternalProjects.cmake index 19059b4c6..5a634abf8 100644 --- a/cmake/ExternalProjects.cmake +++ b/cmake/ExternalProjects.cmake @@ -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