Skip to content
Snippets Groups Projects

Compare revisions

Changes are shown as if the source revision was being merged into the target revision. Learn more about comparing revisions.

Source

Select target project
No results found

Target

Select target project
  • caosdb/src/caosdb-proto
1 result
Show changes
Commits on Source (2)
...@@ -71,7 +71,8 @@ pages: ...@@ -71,7 +71,8 @@ pages:
tags: [ docker ] tags: [ docker ]
stage: deploy stage: deploy
only: only:
- web refs:
- main
script: script:
- export GOPATH=/usr/local/go - export GOPATH=/usr/local/go
- export PATH=$PATH:$GOPATH/bin - export PATH=$PATH:$GOPATH/bin
......
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
cmake_minimum_required(VERSION 3.13) cmake_minimum_required(VERSION 3.13)
set(CAOSDB_PROTO_VERSION 0.0.1) set(CAOSDB_PROTO_VERSION 0.0.10)
project("caosdb-proto" project("caosdb-proto"
VERSION ${CAOSDB_PROTO_VERSION} VERSION ${CAOSDB_PROTO_VERSION}
......
...@@ -20,6 +20,8 @@ ...@@ -20,6 +20,8 @@
project = '@CMAKE_PROJECT_NAME@' project = '@CMAKE_PROJECT_NAME@'
copyright = '2021 IndiScale GmbH' copyright = '2021 IndiScale GmbH'
author = 'Timm Fitschen' author = 'Timm Fitschen'
version = '@CMAKE_PROJECT_VERSION@'
release = '@CMAKE_PROJECT_VERSION@'
rst_prolog = """ rst_prolog = """
.. |PROJECT_NAME| replace:: @CMAKE_PROJECT_NAME@ .. |PROJECT_NAME| replace:: @CMAKE_PROJECT_NAME@
......
...@@ -20,6 +20,7 @@ ...@@ -20,6 +20,7 @@
set(CAOSDB_API_PACKAGES set(CAOSDB_API_PACKAGES
caosdb.info.v1alpha1 caosdb.info.v1alpha1
caosdb.entity.v1alpha1
) )
# pass variable to parent scope # pass variable to parent scope
......