From cc5a424f5b478a912f0c8b9fce9bd7cc1d90b1ee Mon Sep 17 00:00:00 2001
From: Timm Fitschen <t.fitschen@indiscale.com>
Date: Wed, 2 Jun 2021 02:50:51 +0200
Subject: [PATCH] WIP: pipeline
---
.gitlab-ci.yml | 6 +++++-
doc/CMakeLists.txt | 8 ++++----
2 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 0e06c2b..34bfeab 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -44,7 +44,7 @@ build-testenv:
image: docker:20.10
only:
- web
- - schedulE
+ - schedule
stage: setup
script:
- docker login -u gitlab-ci-token -p $CI_JOB_TOKEN $CI_REGISTRY
@@ -61,6 +61,8 @@ build-testenv:
code_style:
tags: [ docker ]
stage: test
+ only:
+ - web
script:
- clang-format-11 --dry-run --verbose --Werror $(find ./proto -type f -iname "*.proto")
allow_failure: true
@@ -69,6 +71,8 @@ code_style:
linting:
tags: [ docker ]
stage: test
+ only:
+ - web
script:
- buf lint
diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt
index 5701fd1..8ec4670 100644
--- a/doc/CMakeLists.txt
+++ b/doc/CMakeLists.txt
@@ -22,11 +22,11 @@ find_program(SPHINX_CMD sphinx-build)
find_program(PROTOC_CMD protoc)
find_program(PROTOC_GEN_DOC_PLUGIN protoc-gen-doc)
if (NOT PROTOC_CMD)
- message(FATAL "Protoc compiler needs to be installed to generate the documentation")
+ message(FATAL_ERROR "Protoc compiler needs to be installed to generate the documentation")
elseif (NOT PROTOC_GEN_DOC_PLUGIN)
- message(FATAL "Proto-gen-doc plugin needs to be installed to generate the documentation")
+ message(FATAL_ERROR "Proto-gen-doc plugin needs to be installed to generate the documentation")
elseif (NOT SPHINX_CMD)
- message(FATAL "Sphinx needs to be installed to generate the documentation")
+ message(FATAL_ERROR "Sphinx needs to be installed to generate the documentation")
else ()
# Copy sources to build directory
add_custom_target(doc-copy-sources
@@ -43,7 +43,7 @@ else ()
add_custom_target(doc-scalar-value-types
COMMAND ${PROTOC_CMD}
--doc_out=${CMAKE_CURRENT_BINARY_DIR}_build/
- --doc_opt=${CMAKE_CURRENT_BINARY_DIR}_build/scalar-value-types.rst.tmpl,scalar-value-types.rst
+ --doc_opt=${CMAKE_CURRENT_SOURCE_DIR}/scalar-value-types.rst.tmpl,scalar-value-types.rst
${PACKAGE_DIR}/main.proto
WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}/proto/
COMMENT "Generating API documentation for protobuf's native scalar value types."
--
GitLab