From 1f909106db82511bf2d50a956a28fe0280157afb Mon Sep 17 00:00:00 2001 From: Carlos Segarra Date: Sun, 19 Dec 2021 15:06:02 +0000 Subject: [PATCH 1/5] add revision to each cmake dependency --- cmake/ExternalProjects.cmake | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/cmake/ExternalProjects.cmake b/cmake/ExternalProjects.cmake index 7f16a103b..d94465e55 100644 --- a/cmake/ExternalProjects.cmake +++ b/cmake/ExternalProjects.cmake @@ -22,17 +22,17 @@ conan_check(VERSION 1.41.0 REQUIRED) conan_cmake_configure( REQUIRES - boost/1.77.0 - catch2/2.13.7 - cppcodec/0.2 - cpprestsdk/2.10.18 - cppzmq/4.8.1 - flatbuffers/2.0.0 - hiredis/1.0.2 - protobuf/3.17.1 - rapidjson/cci.20200410 - spdlog/1.9.2 - zeromq/4.3.4 + 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 + spdlog/1.9.2#3724602b7b7e843c5e0a687c45e279c9 + zeromq/4.3.4#3b9b0de9c4509784dc92629f3aaf2fe4 GENERATORS cmake_find_package cmake_paths From 7048e23a8ebf6f0199c2cbde720188c5ea3cbf1f Mon Sep 17 00:00:00 2001 From: Carlos Segarra Date: Sun, 19 Dec 2021 15:06:24 +0000 Subject: [PATCH 2/5] pin to conan release, not latest --- docker/faabric-base.dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/faabric-base.dockerfile b/docker/faabric-base.dockerfile index 0ba38c528..016c368de 100644 --- a/docker/faabric-base.dockerfile +++ b/docker/faabric-base.dockerfile @@ -48,7 +48,7 @@ RUN apt install -y \ sudo \ unzip -RUN curl -s -L -o /tmp/conan-latest.deb https://github.com/conan-io/conan/releases/latest/download/conan-ubuntu-64.deb && sudo dpkg -i /tmp/conan-latest.deb && rm -f /tmp/conan-latest.deb +RUN curl -s -L -o /tmp/conan-latest.deb https://github.com/conan-io/conan/releases/download/1.43.0/conan-ubuntu-64.deb && sudo dpkg -i /tmp/conan-latest.deb && rm -f /tmp/conan-latest.deb # Tidy up RUN apt-get clean autoclean From 242b1e4f8ca9b42cf215d32d113fe0b0cf93df53 Mon Sep 17 00:00:00 2001 From: Carlos Segarra Date: Sun, 19 Dec 2021 15:07:31 +0000 Subject: [PATCH 3/5] bump version --- .env | 4 ++-- .github/workflows/tests.yml | 6 +++--- VERSION | 2 +- mpi-native/mpi-native.env | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.env b/.env index e06034e91..aafc3e749 100644 --- a/.env +++ b/.env @@ -1,3 +1,3 @@ -FAABRIC_VERSION=0.2.2 -FAABRIC_CLI_IMAGE=faasm/faabric:0.2.2 +FAABRIC_VERSION=0.2.3 +FAABRIC_CLI_IMAGE=faasm/faabric:0.2.3 COMPOSE_PROJECT_NAME=faabric-dev diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 29dada0cd..4e89064fe 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.2 + image: faasm/faabric:0.2.3 defaults: run: working-directory: /code/faabric @@ -49,7 +49,7 @@ jobs: REDIS_QUEUE_HOST: redis REDIS_STATE_HOST: redis container: - image: faasm/faabric:0.2.2 + image: faasm/faabric:0.2.3 defaults: run: working-directory: /code/faabric @@ -136,7 +136,7 @@ jobs: REDIS_QUEUE_HOST: redis REDIS_STATE_HOST: redis container: - image: faasm/faabric:0.2.2 + image: faasm/faabric:0.2.3 defaults: run: working-directory: /code/faabric diff --git a/VERSION b/VERSION index ee1372d33..717903969 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -0.2.2 +0.2.3 diff --git a/mpi-native/mpi-native.env b/mpi-native/mpi-native.env index a48ea72c9..012fb7612 100644 --- a/mpi-native/mpi-native.env +++ b/mpi-native/mpi-native.env @@ -1,4 +1,4 @@ -FAABRIC_VERSION=0.2.2 +FAABRIC_VERSION=0.2.3 FAABRIC_MPI_NATIVE_IMAGE=faasm/faabric-mpi-native:0.0.18 COMPOSE_PROJECT_NAME=faabric-mpi From e57db7efa9bc97a1008e9eb64e1fb69baed9bc4b Mon Sep 17 00:00:00 2001 From: Carlos Segarra Date: Sun, 19 Dec 2021 15:16:16 +0000 Subject: [PATCH 4/5] fix reivision syntax --- cmake/ExternalProjects.cmake | 29 ++++++++++++++++++----------- docker/faabric.dockerfile | 2 +- 2 files changed, 19 insertions(+), 12 deletions(-) diff --git a/cmake/ExternalProjects.cmake b/cmake/ExternalProjects.cmake index d94465e55..dca6b0459 100644 --- a/cmake/ExternalProjects.cmake +++ b/cmake/ExternalProjects.cmake @@ -18,21 +18,28 @@ endif() include(${CMAKE_CURRENT_BINARY_DIR}/conan.cmake) -conan_check(VERSION 1.41.0 REQUIRED) +conan_check(VERSION 1.43.0 REQUIRED) + +# Enable revisions in the conan config +execute_process(COMMAND ${CONAN_CMD} config set general.revisions_enabled=1 + RESULT_VARIABLE RET_CODE) +if(NOT "${RET_CODE}" STREQUAL "0") + message(FATAL_ERROR "Error setting revisions for Conan: '${RET_CODE}'") +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 - spdlog/1.9.2#3724602b7b7e843c5e0a687c45e279c9 - zeromq/4.3.4#3b9b0de9c4509784dc92629f3aaf2fe4 + 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 + spdlog/1.9.2@#3724602b7b7e843c5e0a687c45e279c9 + zeromq/4.3.4@#3b9b0de9c4509784dc92629f3aaf2fe4 GENERATORS cmake_find_package cmake_paths diff --git a/docker/faabric.dockerfile b/docker/faabric.dockerfile index 145e4c9f5..69f480eb2 100644 --- a/docker/faabric.dockerfile +++ b/docker/faabric.dockerfile @@ -1,4 +1,4 @@ -FROM faasm/faabric-base:0.2.2 +FROM faasm/faabric-base:0.2.3 ARG FAABRIC_VERSION # faabic-base image is not re-built often, so tag may be behind From bfd085b896a9ae32771a895508d952d0c293a85d Mon Sep 17 00:00:00 2001 From: Carlos Segarra Date: Sun, 19 Dec 2021 16:12:12 +0000 Subject: [PATCH 5/5] must also bump the container image tag in the sanitisers yaml --- .github/workflows/sanitisers.yml | 10 +++++----- docs/development.md | 1 + 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/.github/workflows/sanitisers.yml b/.github/workflows/sanitisers.yml index 1a0fd87a3..4fd49270b 100644 --- a/.github/workflows/sanitisers.yml +++ b/.github/workflows/sanitisers.yml @@ -20,7 +20,7 @@ jobs: REDIS_QUEUE_HOST: redis REDIS_STATE_HOST: redis container: - image: faasm/faabric:0.2.2 + image: faasm/faabric:0.2.3 defaults: run: working-directory: /code/faabric @@ -65,7 +65,7 @@ jobs: REDIS_QUEUE_HOST: redis REDIS_STATE_HOST: redis container: - image: faasm/faabric:0.2.2 + image: faasm/faabric:0.2.3 defaults: run: working-directory: /code/faabric @@ -115,7 +115,7 @@ jobs: REDIS_QUEUE_HOST: redis REDIS_STATE_HOST: redis container: - image: faasm/faabric:0.2.2 + image: faasm/faabric:0.2.3 defaults: run: working-directory: /code/faabric @@ -166,7 +166,7 @@ jobs: REDIS_QUEUE_HOST: redis REDIS_STATE_HOST: redis container: - image: faasm/faabric:0.2.2 + image: faasm/faabric:0.2.3 defaults: run: working-directory: /code/faabric @@ -217,7 +217,7 @@ jobs: REDIS_QUEUE_HOST: redis REDIS_STATE_HOST: redis container: - image: faasm/faabric:0.2.2 + image: faasm/faabric:0.2.3 defaults: run: working-directory: /code/faabric diff --git a/docs/development.md b/docs/development.md index 533a6614c..f0348185f 100644 --- a/docs/development.md +++ b/docs/development.md @@ -129,6 +129,7 @@ bumped version. It should appear in: - `VERSION` - `.env` +- `.github/workflows/sanitisers.yml`. - `.github/workflows/tests.yml`. - `mpi-native/mpi-native.env`