From 62ec11f46b8036b632f50d31b6f406e021cee086 Mon Sep 17 00:00:00 2001
From: Lars Bilke <lars.bilke@ufz.de>
Date: Mon, 22 Feb 2021 08:17:37 +0100
Subject: [PATCH] [CMake] Fix git branch detection on CI.
---
scripts/cmake/GitSetup.cmake | 16 ++++++++++------
.../devguide/getting-started/introduction.md | 2 ++
2 files changed, 12 insertions(+), 6 deletions(-)
diff --git a/scripts/cmake/GitSetup.cmake b/scripts/cmake/GitSetup.cmake
index 4a740ad01d4..5616b091461 100644
--- a/scripts/cmake/GitSetup.cmake
+++ b/scripts/cmake/GitSetup.cmake
@@ -29,12 +29,16 @@ if(NOT IS_GIT_REPO)
endif()
if(IS_GIT_REPO)
- execute_process(
- COMMAND ${GIT_EXECUTABLE} rev-parse --abbrev-ref HEAD
- WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}
- OUTPUT_VARIABLE OGS_GIT_BRANCH
- OUTPUT_STRIP_TRAILING_WHITESPACE
- )
+ if(DEFINED ENV{CI_COMMIT_BRANCH})
+ set(OGS_GIT_BRANCH $ENV{CI_COMMIT_BRANCH})
+ else()
+ execute_process(
+ COMMAND ${GIT_EXECUTABLE} rev-parse --abbrev-ref HEAD
+ WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}
+ OUTPUT_VARIABLE OGS_GIT_BRANCH
+ OUTPUT_STRIP_TRAILING_WHITESPACE
+ )
+ endif()
endif()
if(IS_GIT_REPO AND NOT OGS_VERSION)
diff --git a/web/content/docs/devguide/getting-started/introduction.md b/web/content/docs/devguide/getting-started/introduction.md
index 3c2d0e8c9ea..db7109f2874 100644
--- a/web/content/docs/devguide/getting-started/introduction.md
+++ b/web/content/docs/devguide/getting-started/introduction.md
@@ -4,6 +4,8 @@ title = "Welcome!"
author = "Lars Bilke"
weight = 1001
+aliases = ["/docs/devguide"]
+
[menu.docs]
name = "Developer Guide"
identifier = "devguide"
--
GitLab