From bda65c06c8d8bb35e5c5acb14bcae6a4d3d936db Mon Sep 17 00:00:00 2001 From: Justus Ranvier Date: Fri, 2 Feb 2024 07:03:10 -0600 Subject: [PATCH] upgrade to otcommon 3 --- .github/workflows/compile.yml | 4 ++-- .github/workflows/format.yml | 2 +- .github/workflows/iwyu.yml | 2 +- CMakeLists.txt | 2 +- src/metier_server/CMakeLists.txt | 2 +- tools/docker/docker-bake.hcl | 4 ++-- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/compile.yml b/.github/workflows/compile.yml index 9039ec6..190cf26 100644 --- a/.github/workflows/compile.yml +++ b/.github/workflows/compile.yml @@ -15,10 +15,10 @@ jobs: preset: [default] include: - toolchain: gcc - docker: 1.189.0 + docker: 1.190.2 compiler: gcc - toolchain: clang - docker: 1.189.0 + docker: 1.190.2 compiler: clang steps: - name: Checkout opentxs diff --git a/.github/workflows/format.yml b/.github/workflows/format.yml index 845a712..bc600a6 100644 --- a/.github/workflows/format.yml +++ b/.github/workflows/format.yml @@ -11,7 +11,7 @@ jobs: strategy: fail-fast: false env: - docker: '1.189.0' + docker: '1.190.2' steps: - name: Checkout opentxs uses: actions/checkout@v3 diff --git a/.github/workflows/iwyu.yml b/.github/workflows/iwyu.yml index 0d60d3e..12ce327 100644 --- a/.github/workflows/iwyu.yml +++ b/.github/workflows/iwyu.yml @@ -11,7 +11,7 @@ jobs: strategy: fail-fast: true env: - docker: '1.189.0' + docker: '1.190.2' steps: - name: Checkout opentxs uses: actions/checkout@v3 diff --git a/CMakeLists.txt b/CMakeLists.txt index 9c37be8..8706ba7 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -21,7 +21,7 @@ project(metier-server) find_package( otcommon - 2 + 3 CONFIG REQUIRED ) diff --git a/src/metier_server/CMakeLists.txt b/src/metier_server/CMakeLists.txt index 2b7e328..ee3bda2 100644 --- a/src/metier_server/CMakeLists.txt +++ b/src/metier_server/CMakeLists.txt @@ -6,7 +6,7 @@ set(cxx-sources main.cpp) add_executable(${PROJECT_NAME} ${cxx-sources}) -otcommon_configure_cxx_target(${PROJECT_NAME}) +otcommon_configure_target_cxx(${PROJECT_NAME}) otcommon_define_signed_overflow(${PROJECT_NAME}) target_link_libraries( diff --git a/tools/docker/docker-bake.hcl b/tools/docker/docker-bake.hcl index 5bd62ea..a85ed51 100644 --- a/tools/docker/docker-bake.hcl +++ b/tools/docker/docker-bake.hcl @@ -1,5 +1,5 @@ -variable "tag" { default = "23.3.2" } -variable "opentxs" { default = "1.189.0" } +variable "tag" { default = "24.0.0" } +variable "opentxs" { default = "1.190.2" } variable "target_arch" { default = "amd64"