From 45f81c3dbeead80af8426fd4f751a3a6686ecc1f Mon Sep 17 00:00:00 2001 From: Alex_Mueller Date: Thu, 18 Jan 2024 19:43:30 +0100 Subject: [PATCH] fix release workflow --- .github/workflows/createRelease.yml | 21 +++++++++++++-------- docs/CMakeLists.txt | 2 +- docs/website/doxygen/CMakeLists.txt | 1 + docs/website/doxygen/mainpage.md | 4 ++-- 4 files changed, 17 insertions(+), 11 deletions(-) diff --git a/.github/workflows/createRelease.yml b/.github/workflows/createRelease.yml index 8d6f2e413..59d352028 100644 --- a/.github/workflows/createRelease.yml +++ b/.github/workflows/createRelease.yml @@ -17,6 +17,9 @@ env: jobs: Run: runs-on: ubuntu-latest + container: + image: ikarusproject/ikarus-dev:latest + options: --memory-swap="20g" --memory="20g" --cpus="2" --user root steps: - uses: actions/checkout@v2 with: @@ -46,14 +49,14 @@ jobs: run: | pip install mkdocs mkdocs-macros-plugin mkdocs-drawio-exporter mkdocs-bibtex mike mkdocs-glightbox pillow cairosvg pip install git+https://${{ secrets.MKDOCS_TOKEN }}@github.com/squidfunk/mkdocs-material-insiders.git - sudo apt-get install libcairo2-dev libfreetype6-dev libffi-dev libjpeg-dev libpng-dev libz-dev + apt-get update && apt-get install -y libcairo2-dev libfreetype6-dev libffi-dev libjpeg-dev libpng-dev libz-dev - name: Build Doxygen run: | - git clone https://github.com/jothepro/doxygen-awesome-css.git + git clone https://github.com/jothepro/doxygen-awesome-css.git cd doxygen-awesome-css make install - apt-get install texlive-base + apt-get install -y texlive-base cd .. cd repo mkdir build_docs @@ -84,9 +87,11 @@ jobs: path: .cache - name: Build Website for offline use run: | - cd ./repo/docs - cmake -B .build - cmake --build .build --target site + cd ./repo/ + mkdir build_docs_offline + cd build_docs_offline + cmake .. -DBUILD_DOCS=1 -DDUNE_ENABLE_PYTHONBINDINGS=0 + cmake --build . --target site mv site documentation-v$NEWVERSION tar -czf docs-v$NEWVERSION.tar.gz ./documentation-v$NEWVERSION zip -9r docs-v$NEWVERSION.zip ./documentation-v$NEWVERSION @@ -154,8 +159,8 @@ jobs: prerelease: true title: ${{ github.event.inputs.releaseTag }} files: | - ./repo/docs/docs-v${{ github.event.inputs.releaseTag }}.tar.gz - ./repo/docs/docs-v${{ github.event.inputs.releaseTag }}.zip + ./repo/build_docs_offline/docs-v${{ github.event.inputs.releaseTag }}.tar.gz + ./repo/build_docs_offline/docs-v${{ github.event.inputs.releaseTag }}.zip ikarus-dev-docker-v${{ github.event.inputs.releaseTag }}.tar.gz ikarus-docker-v${{ github.event.inputs.releaseTag }}.tar.gz ikarus-examples-v${{ github.event.inputs.releaseTag }}.tar.gz diff --git a/docs/CMakeLists.txt b/docs/CMakeLists.txt index 3d664038e..b177c0840 100644 --- a/docs/CMakeLists.txt +++ b/docs/CMakeLists.txt @@ -11,7 +11,7 @@ add_subdirectory(website/doxygen) add_custom_target( site - COMMAND xvfb-run -a mkdocs build --config-file mkdocs.insiders.yml + COMMAND mkdocs build --config-file mkdocs.insiders.yml WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}" ) diff --git a/docs/website/doxygen/CMakeLists.txt b/docs/website/doxygen/CMakeLists.txt index c719b90ff..064c1d183 100644 --- a/docs/website/doxygen/CMakeLists.txt +++ b/docs/website/doxygen/CMakeLists.txt @@ -2,5 +2,6 @@ # mueller@ibb.uni-stuttgart.de SPDX-License-Identifier: LGPL-3.0-or-later file(GLOB_RECURSE HEADERS CONFIGURE_DEPENDS ../../../ikarus/**/*.hh ../../../ikarus/**/*.inl) list(APPEND HEADERS modules.hh mainpage.md Doxylocal ../../literature.bib) +include(DuneDoxygen) add_doxygen_target(DEPENDS ${HEADERS}) message(STATUS "Add doxygen target") diff --git a/docs/website/doxygen/mainpage.md b/docs/website/doxygen/mainpage.md index b1d6453db..b5f996a0b 100644 --- a/docs/website/doxygen/mainpage.md +++ b/docs/website/doxygen/mainpage.md @@ -1,4 +1,4 @@ -# Introduction {#mainpage} +# Introduction