From 668d9b4bcfed33bd4f06910858f5cabedfa1f658 Mon Sep 17 00:00:00 2001 From: Cayleb-Ordo Date: Mon, 16 Sep 2024 22:07:46 +0200 Subject: [PATCH] ci: Update CI to use the new Doxygen Build process. Add a new Dockerfile which uses debian:trixie-slim instead of debian:buster as base. Set the used Rust version to 1.51.0. Modify Jenkins Pipeline to use the new Dockerfile. --- .../jenkins/dockerfiles/gcc13-docs.Dockerfile | 50 +++++++++++++++++++ .../pipelines/technical-docs.Jenkinsfile | 6 +-- 2 files changed, 53 insertions(+), 3 deletions(-) create mode 100644 build/jenkins/dockerfiles/gcc13-docs.Dockerfile diff --git a/build/jenkins/dockerfiles/gcc13-docs.Dockerfile b/build/jenkins/dockerfiles/gcc13-docs.Dockerfile new file mode 100644 index 0000000000..a83bc3d767 --- /dev/null +++ b/build/jenkins/dockerfiles/gcc13-docs.Dockerfile @@ -0,0 +1,50 @@ +FROM debian:trixie-slim + +RUN useradd -ms /bin/bash --uid 1006 builder + +ARG DEBIAN_FRONTEND=noninteractive +ARG DEBCONF_NOWARNINGS="yes" + +RUN apt-get -qqy update && apt-get install -qqy \ + cmake \ + curl \ + doxygen \ + graphviz \ + libboost-dev \ + libboost-filesystem-dev \ + libcurl4-gnutls-dev \ + libenet-dev \ + libfmt-dev \ + libfreetype6-dev \ + libgloox-dev \ + libgnutls28-dev \ + libgtk-3-dev \ + libicu-dev \ + libidn11-dev \ + libjson-perl \ + libminiupnpc-dev \ + libogg-dev \ + libopenal-dev \ + libpng-dev \ + libsdl2-dev \ + libsodium-dev \ + libvorbis-dev \ + libwxgtk3.0-dev \ + libxcursor-dev \ + libxml-simple-perl \ + libxml2-dev \ + m4 \ + python3-dev \ + python3-pip \ + zlib1g-dev \ + && apt-get clean + +# Install rust and Cargo via rustup +USER builder +RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- --default-toolchain=1.51.0 -y +ENV PATH="${PATH}:/home/builder/.cargo/bin" +USER root + +ENV SHELL /bin/bash + +USER builder diff --git a/build/jenkins/pipelines/technical-docs.Jenkinsfile b/build/jenkins/pipelines/technical-docs.Jenkinsfile index e120f01c11..0173ccfefa 100644 --- a/build/jenkins/pipelines/technical-docs.Jenkinsfile +++ b/build/jenkins/pipelines/technical-docs.Jenkinsfile @@ -1,4 +1,4 @@ -/* Copyright (C) 2022 Wildfire Games. +/* Copyright (C) 2024 Wildfire Games. * This file is part of 0 A.D. * * 0 A.D. is free software: you can redistribute it and/or modify @@ -32,7 +32,7 @@ pipeline { stage("Engine docs") { steps { ws("/zpool0/entity-docs"){ - sh "cd docs/doxygen/ && doxygen config" + sh "cd docs/doxygen/ && cmake -S . -B build-docs && cmake --build build-docs" } } } @@ -62,7 +62,7 @@ pipeline { stage("Upload") { steps { ws("/zpool0/entity-docs"){ - sh "rsync -rti --delete-after --progress docs/doxygen/html/ docs.wildfiregames.com:~/www/pyrogenesis/" + sh "rsync -rti --delete-after --progress docs/doxygen/build-docs/html/ docs.wildfiregames.com:~/www/pyrogenesis/" sh "rsync -ti --progress source/tools/entdocs/entity-docs.html docs.wildfiregames.com:~/www/entity-docs/trunk.html" sh "rsync -ti --progress source/tools/templatesanalyzer/unit_summary_table.html docs.wildfiregames.com:~/www/templatesanalyzer/index.html" }