Skip to content

Commit 140a8c9

Browse files
csegarragonzcsegarragonz
committed
chore: bump to conan2
1 parent 99c0a1b commit 140a8c9

File tree

14 files changed

+142
-101
lines changed

14 files changed

+142
-101
lines changed

‎.env‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FAABRIC_VERSION=0.21.0
2-
FAABRIC_CLI_IMAGE=ghcr.io/faasm/faabric:0.21.0
1+
FAABRIC_VERSION=0.22.0
2+
FAABRIC_CLI_IMAGE=ghcr.io/faasm/faabric:0.22.0
33
COMPOSE_PROJECT_NAME=faabric-dev
44
CONAN_CACHE_MOUNT_SOURCE=./conan-cache/

‎.github/workflows/tests.yml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
if: github.event.pull_request.draft == false
2121
runs-on: ubuntu-latest
2222
container:
23-
image: ghcr.io/faasm/faabric:0.21.0
23+
image: ghcr.io/faasm/faabric:0.22.0
2424
env:
2525
DEPLOYMENT_TYPE: gha-ci
2626
steps:
@@ -34,7 +34,7 @@ jobs:
3434
if: github.event.pull_request.draft == false
3535
runs-on: ubuntu-latest
3636
container:
37-
image: ghcr.io/faasm/faabric:0.21.0
37+
image: ghcr.io/faasm/faabric:0.22.0
3838
steps:
3939
- name: "Check out code"
4040
uses: actions/checkout@v4
@@ -45,7 +45,7 @@ jobs:
4545
if: github.event.pull_request.draft == false
4646
runs-on: ubuntu-latest
4747
container:
48-
image: ghcr.io/faasm/faabric:0.21.0
48+
image: ghcr.io/faasm/faabric:0.22.0
4949
steps:
5050
- name: "Check out code"
5151
uses: actions/checkout@v4
@@ -65,7 +65,7 @@ jobs:
6565
REDIS_QUEUE_HOST: redis
6666
REDIS_STATE_HOST: redis
6767
container:
68-
image: ghcr.io/faasm/faabric:0.21.0
68+
image: ghcr.io/faasm/faabric:0.22.0
6969
options: --privileged
7070
services:
7171
redis:
@@ -104,7 +104,7 @@ jobs:
104104
REDIS_QUEUE_HOST: redis
105105
REDIS_STATE_HOST: redis
106106
container:
107-
image: ghcr.io/faasm/faabric:0.21.0
107+
image: ghcr.io/faasm/faabric:0.22.0
108108
options: --privileged
109109
services:
110110
redis:
@@ -156,7 +156,7 @@ jobs:
156156
REDIS_QUEUE_HOST: redis
157157
REDIS_STATE_HOST: redis
158158
container:
159-
image: ghcr.io/faasm/faabric:0.21.0
159+
image: ghcr.io/faasm/faabric:0.22.0
160160
services:
161161
redis:
162162
image: redis

‎VERSION‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
0.21.0
1+
0.22.0

‎cmake/ExternalProjects.cmake‎

Lines changed: 5 additions & 73 deletions
Original file line numberDiff line numberDiff line change
@@ -8,81 +8,13 @@ find_package (Threads REQUIRED)
88
list(PREPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_BINARY_DIR})
99
list(PREPEND CMAKE_PREFIX_PATH ${CMAKE_CURRENT_BINARY_DIR})
1010

11-
if(NOT EXISTS "${CMAKE_CURRENT_BINARY_DIR}/conan.cmake")
12-
message(STATUS "Downloading conan.cmake from https://github.com/conan-io/cmake-conan")
13-
file(DOWNLOAD "https://raw.githubusercontent.com/conan-io/cmake-conan/0.18.1/conan.cmake"
14-
"${CMAKE_CURRENT_BINARY_DIR}/conan.cmake"
15-
TLS_VERIFY ON)
16-
endif()
17-
18-
set(CONAN_CMAKE_SILENT_OUTPUT ON CACHE INTERNAL "")
19-
include(${CMAKE_CURRENT_BINARY_DIR}/conan.cmake)
20-
21-
conan_check(VERSION 1.63.0 REQUIRED)
22-
23-
# Enable revisions in the conan config
24-
execute_process(COMMAND ${CONAN_CMD} config set general.revisions_enabled=1
25-
RESULT_VARIABLE RET_CODE)
26-
if(NOT "${RET_CODE}" STREQUAL "0")
27-
message(FATAL_ERROR "Error setting revisions for Conan: '${RET_CODE}'")
28-
endif()
29-
30-
# --------------------------------
31-
# Conan dependencies
32-
# --------------------------------
33-
34-
conan_cmake_configure(
35-
REQUIRES
36-
"abseil/20220623.0@#732381dc99db29b4cfd293684891da56"
37-
"boost/1.84.0@#7604ce1e7485780469dffb6430f232ea"
38-
"catch2/2.13.9@#8793d3e6287d3684201418de556d98fe"
39-
"flatbuffers/23.5.26@#b153646f6546daab4c7326970b6cd89c"
40-
"hiredis/1.0.2@#370dad964286cadb1f15dc90252e8ef3"
41-
"openssl/3.0.2@#269fa93e5afe8c34bd9a0030d2b8f0fe"
42-
"protobuf/3.20.0@#8e4de7081bea093469c9e6076149b2b4"
43-
"readerwriterqueue/1.0.6@#a95c8da3d68822dec4d4c13fff4b5c96"
44-
"spdlog/1.10.0@#6406c337028e15e56cd6a070cbac54c4"
45-
"zlib/1.2.12@#3b9e037ae1c615d045a06c67d88491ae"
46-
GENERATORS
47-
cmake_find_package
48-
cmake_paths
49-
OPTIONS
50-
boost:error_code_header_only=True
51-
boost:system_no_deprecated=True
52-
boost:zlib=False
53-
boost:bzip2=False
54-
boost:lzma=False
55-
boost:zstd=False
56-
boost:without_locale=True
57-
boost:without_log=True
58-
boost:without_mpi=True
59-
boost:without_python=True
60-
boost:without_test=True
61-
boost:without_wave=True
62-
)
63-
64-
conan_cmake_autodetect(FAABRIC_CONAN_SETTINGS)
65-
66-
conan_cmake_install(PATH_OR_REFERENCE .
67-
BUILD outdated
68-
UPDATE
69-
REMOTE conancenter
70-
PROFILE_HOST ${CMAKE_CURRENT_LIST_DIR}/../conan-profile.txt
71-
PROFILE_BUILD ${CMAKE_CURRENT_LIST_DIR}/../conan-profile.txt
72-
SETTINGS ${FAABRIC_CONAN_SETTINGS}
73-
)
74-
75-
include(${CMAKE_CURRENT_BINARY_DIR}/conan_paths.cmake)
76-
7711
find_package(absl QUIET REQUIRED)
78-
find_package(Boost 1.80.0 QUIET REQUIRED)
12+
find_package(Boost 1.84.0 QUIET REQUIRED COMPONENTS system)
7913
find_package(Catch2 QUIET REQUIRED)
80-
find_package(flatbuffers QUIET REQUIRED)
14+
find_package(flatbuffers CONFIG QUIET REQUIRED)
8115
find_package(fmt QUIET REQUIRED)
8216
find_package(hiredis QUIET REQUIRED)
83-
# 27/01/2023 - Pin OpenSSL to a specific version to avoid incompatibilities
84-
# with the system's (i.e. Ubuntu 22.04) OpenSSL
85-
find_package(OpenSSL 3.0.2 QUIET REQUIRED)
17+
find_package(OpenSSL 3.6.0 QUIET REQUIRED)
8618
find_package(Protobuf 3.20.0 QUIET REQUIRED)
8719
find_package(readerwriterqueue QUIET REQUIRED)
8820
find_package(spdlog QUIET REQUIRED)
@@ -121,7 +53,7 @@ FetchContent_Declare(nng_ext
12153
)
12254
FetchContent_Declare(zstd_ext
12355
GIT_REPOSITORY "https://github.com/facebook/zstd"
124-
GIT_TAG "v1.5.2"
56+
GIT_TAG "v1.5.7"
12557
SOURCE_SUBDIR "build/cmake"
12658
)
12759

@@ -150,7 +82,7 @@ target_link_libraries(faabric_common_dependencies INTERFACE
15082
absl::flat_hash_map
15183
absl::strings
15284
atomic_queue::atomic_queue
153-
Boost::Boost
85+
Boost::headers
15486
Boost::system
15587
flatbuffers::flatbuffers
15688
hiredis::hiredis

‎conan-debug.lock‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
{
2+
"version": "0.5",
3+
"requires": [
4+
"zlib/1.2.12#2ea72a0bae8b680f8a282e103e0a6880%1743582313.324",
5+
"spdlog/1.10.0#5aed29a37b544d0eb5812b8be74cd7a4%1731353179.805",
6+
"readerwriterqueue/1.0.6#aaa5ff6fac60c2aee591e9e51b063b83%1679587692.891",
7+
"protobuf/3.20.0#9cc01d27c03a1bdd736a031e4b87e1eb%1700600974.257",
8+
"openssl/3.6.0#89e8af1d4a21afcac0557079d23d8890%1759746682.365",
9+
"libbacktrace/cci.20210118#a7691bfccd8caaf66309df196790a5a1%1722218217.276",
10+
"hiredis/1.0.2#6001a683c04da07565e97e76d0d841bd%1744279494.11",
11+
"fmt/8.1.1#d66420384a943dbf1f292d34ef34c11c%1735899179.969",
12+
"flatbuffers/23.5.26#0290575326fe9b2c39a0236ea81d8c30%1743154511.803",
13+
"catch2/2.13.9#17ac9b0b78c63353e304c5744e862a77%1678135818.816",
14+
"boost/1.84.0#40dd9fecacce0ef109851d0e38727fd0%1759416424.265",
15+
"abseil/20220623.0#bbc28aa2a287b46e488cf28bac5bae65%1706008822.296"
16+
],
17+
"build_requires": [
18+
"b2/5.3.3#107c15377719889654eb9a162a673975%1750340310.079"
19+
],
20+
"python_requires": [],
21+
"config_requires": []
22+
}

‎conan-profile.txt‎

Lines changed: 0 additions & 15 deletions
This file was deleted.

‎conan-release.lock‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
{
2+
"version": "0.5",
3+
"requires": [
4+
"zlib/1.2.12#2ea72a0bae8b680f8a282e103e0a6880%1743582313.324",
5+
"spdlog/1.10.0#5aed29a37b544d0eb5812b8be74cd7a4%1731353179.805",
6+
"readerwriterqueue/1.0.6#aaa5ff6fac60c2aee591e9e51b063b83%1679587692.891",
7+
"protobuf/3.20.0#9cc01d27c03a1bdd736a031e4b87e1eb%1700600974.257",
8+
"openssl/3.6.0#89e8af1d4a21afcac0557079d23d8890%1759746682.365",
9+
"libbacktrace/cci.20210118#a7691bfccd8caaf66309df196790a5a1%1722218217.276",
10+
"hiredis/1.0.2#6001a683c04da07565e97e76d0d841bd%1744279494.11",
11+
"fmt/8.1.1#d66420384a943dbf1f292d34ef34c11c%1735899179.969",
12+
"flatbuffers/23.5.26#0290575326fe9b2c39a0236ea81d8c30%1743154511.803",
13+
"catch2/2.13.9#17ac9b0b78c63353e304c5744e862a77%1678135818.816",
14+
"boost/1.84.0#40dd9fecacce0ef109851d0e38727fd0%1759416424.265",
15+
"abseil/20220623.0#bbc28aa2a287b46e488cf28bac5bae65%1706008822.296"
16+
],
17+
"build_requires": [
18+
"b2/5.3.3#107c15377719889654eb9a162a673975%1750340310.079"
19+
],
20+
"python_requires": [],
21+
"config_requires": []
22+
}

‎conanfile.txt‎

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
[requires]
2+
abseil/20220623.0
3+
boost/1.84.0
4+
catch2/2.13.9
5+
flatbuffers/23.5.26
6+
hiredis/1.0.2
7+
openssl/3.6.0
8+
protobuf/3.20.0
9+
readerwriterqueue/1.0.6
10+
spdlog/1.10.0
11+
zlib/1.2.12
12+
# (Optional) Only if CMake can’t find fmt below:
13+
# fmt/9.1.0
14+
15+
[generators]
16+
CMakeToolchain
17+
CMakeDeps
18+
19+
[options]
20+
boost/*:error_code_header_only=True
21+
boost/*:system_no_deprecated=True
22+
boost/*:zlib=False
23+
boost/*:bzip2=False
24+
boost/*:lzma=False
25+
boost/*:zstd=False
26+
boost/*:without_locale=True
27+
boost/*:without_log=True
28+
boost/*:without_mpi=True
29+
boost/*:without_python=True
30+
boost/*:without_test=True
31+
boost/*:without_wave=True

‎conanprofile.txt‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
[settings]
2+
os=Linux
3+
arch=x86_64
4+
compiler=clang
5+
compiler.version=17
6+
compiler.libcxx=libstdc++11
7+
compiler.cppstd=20
8+
build_type=Release
9+
10+
[conf]
11+
# Tell Conan which compiler binaries to run
12+
tools.build:compiler_executables={"c": "/usr/bin/clang-17", "cpp": "/usr/bin/clang++-17"}

‎docker/faabric-base.dockerfile‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,18 +50,20 @@ RUN apt update && apt install -y \
5050
unzip
5151

5252
# Install up-to-date CMake
53+
ARG CMAKE_VERSION=4.1.2
5354
RUN apt remove --purge --auto-remove cmake \
5455
&& mkdir -p /setup \
5556
&& cd /setup \
5657
&& wget -q -O cmake-linux.sh \
57-
https://github.com/Kitware/CMake/releases/download/v3.28.0/cmake-3.28.0-linux-x86_64.sh \
58+
https://github.com/Kitware/CMake/releases/download/v${CMAKE_VERSION}/cmake-${CMAKE_VERSION}-linux-x86_64.sh \
5859
&& sh cmake-linux.sh -- --skip-license --prefix=/usr/local \
5960
&& apt clean autoclean -y \
6061
&& apt autoremove -y
6162

6263
# Install Conan
64+
ARG CONAN_VERSION=2.21.0
6365
RUN curl -s -L -o \
64-
/tmp/conan-latest.deb https://github.com/conan-io/conan/releases/download/1.63.0/conan-ubuntu-64.deb \
66+
/tmp/conan-latest.deb https://github.com/conan-io/conan/releases/download/${CONAN_VERSION}/conan-${CONAN_VERSION}-amd64.deb \
6567
&& sudo dpkg -i /tmp/conan-latest.deb \
6668
&& rm -f /tmp/conan-latest.deb
6769

0 commit comments

Comments
 (0)