From 0692727acda99e0bbec0809eec46b45abc7f3b3d Mon Sep 17 00:00:00 2001
From: Alfin Johny <alfin.johny@tum.de>
Date: Thu, 2 Jan 2025 11:06:59 +0100
Subject: [PATCH] Fix build issues
---
.gitlab-ci.yml | 16 +---------------
1 file changed, 1 insertion(+), 15 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index f6f32ba..f446026 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -63,18 +63,10 @@ pages:
- pip install pipenv
- pipenv install # Install the dependencies from the Pipfile
- pipenv run pip install mkdoxy # Install the mkdoxy plugin if needed
- - echo "MkDocs version:"
- - pipenv run mkdocs --version
- apt-get update
- apt-get install -y doxygen
- export DOXYGEN_BIN=/usr/bin/doxygen
- pipenv install --dev # Install all necessary dependencies
- - echo "Listing files in the project directory:"
- - ls -la $CI_PROJECT_DIR
- - echo "Listing files in docs directory:"
- - ls -la $CI_PROJECT_DIR/docs
- - which doxygen # Verifies that Doxygen is available in the path
-
script:
# Create the folder where the generated markdown files will be stored
- mkdir $CI_PROJECT_DIR/docs/aircraft-xml
@@ -84,9 +76,7 @@ pages:
# Repeat for other titles (structure, propulsion, etc.)
- python $CI_PROJECT_DIR/scripts/document_aircraft_xml.py --title Geometry --level 6 $CI_PROJECT_DIR/scripts/CSR-02.xml > $CI_PROJECT_DIR/docs/aircraft-xml/geometry.md
# Use the persisted content from the previous stage (aircraft-design)
- - cp -r $CI_PROJECT_DIR/aircraft-design $CI_PROJECT_DIR/docs/ # Copy content to the docs folder
- - echo "Listing files:"
- - ls -la
+ - cp -r $CI_PROJECT_DIR/aircraft-design $CI_PROJECT_DIR/docs/ # Copy content to the docs folder
# Build the MkDocs documentation site
- pipenv run mkdocs build --verbose --site-dir $CI_PROJECT_DIR/public
@@ -105,11 +95,7 @@ pages:
when: on_success # Run if the source pipeline was successful
# Deploy to GitLab Pages
deploy_gitlab_pages:
-<<<<<<< HEAD
- stage: .post
-=======
stage: deploy to gitlab
->>>>>>> a3a1079f334bf1bc818c8086baa6dba5942cbed0
script:
- mv $CI_PROJECT_DIR/public $CI_PROJECT_DIR/public # Ensure the output is in the public folder
rules:
--
GitLab