Skip to content
Snippets Groups Projects
Commit 8966f340 authored by Florian Spreckelsen's avatar Florian Spreckelsen
Browse files

Merge branch 'dev' into f-upgrade-conan

parents 3860486e 2cc20fae
No related branches found
No related tags found
2 merge requests!37REL: Release v0.1.2,!36WIP FIX: Fix pipeline: Upgrade conan to 1.48.
Pipeline #23272 passed
Stage: info
Stage: setup
Stage: test
Stage: deploy
Pipeline: caosdb-cppinttest

#23273

    This commit is part of merge request !37. Comments created here will be created in the context of that merge request.
    Hide whitespace changes
    Inline Side-by-side
    RELEASE_GUIDELINES.md
    + 3
    − 2
    View file @ 8966f340
    ...@@ -20,8 +20,9 @@ guidelines of the CaosDB Project ...@@ -20,8 +20,9 @@ guidelines of the CaosDB Project
    3. Check all general prerequisites. 3. Check all general prerequisites.
    4. Prepare [CMakeLists.txt](./CMakeLists.txt): Check the `MAJOR`, `MINOR`, `PATCH` 4. Update version numbers:
    version variables. 1. In [CMakeLists.txt](./CMakeLists.txt): Check the `MAJOR`, `MINOR`, `PATCH` version variables.
    2. In `conanfile.py`: Update the `version` variable.
    5. Merge the release branch into the main branch. 5. Merge the release branch into the main branch.
    ......
    conanfile.py
    + 0
    − 1
    View file @ 8966f340
    ...@@ -16,7 +16,6 @@ class CaosdbConan(ConanFile): ...@@ -16,7 +16,6 @@ class CaosdbConan(ConanFile):
    requires = [ requires = [
    ("boost/1.77.0"), ("boost/1.77.0"),
    ("grpc/1.39.1"), ("grpc/1.39.1"),
    ("zlib/1.2.12"), # TODO Remove when grpc dows not require 1.2.10
    ] ]
    build_requires = [ build_requires = [
    ("gtest/1.11.0"), ("gtest/1.11.0"),
    ......
    0% or .
    You are about to add 0 people to the discussion. Proceed with caution.
    Please register or to comment