From 97b3462c9551140b093304eb25f9e41f5981b869 Mon Sep 17 00:00:00 2001 From: Douglas Raillard Date: Wed, 7 Feb 2024 00:29:08 +0000 Subject: [PATCH 1/3] .gitlab-ci.yml: Build pages in parallel --- .gitlab-ci.yml | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index efed9ab81..17e32b819 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -235,7 +235,12 @@ pages: ) } - build_branch main - build_branch preview - build_branch release + build_branch main &> main_stdout & + build_branch preview &> preview_stdout & + build_branch release &> release_stdout & + wait + + cat main_stdout + cat preview_stdout + cat release_stdout -- GitLab From c142ee178f8606c95bcfcec660fdf0310c366b2f Mon Sep 17 00:00:00 2001 From: Douglas Raillard Date: Wed, 7 Feb 2024 00:36:05 +0000 Subject: [PATCH 2/3] .gitlab-ci.yml: Force locale when building doc --- .gitlab-ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 17e32b819..ffd2b1a42 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -231,6 +231,7 @@ pages: cd "$worktree" sudo ./install_base.sh --install-doc-extras source init_env + export LC_ALL=C sphinx-build -b html -n --no-color -W --keep-going -T -j auto . "$out/$branch" ) } -- GitLab From 8d9a95025da701ce48904eb9c9ce3457a07f763a Mon Sep 17 00:00:00 2001 From: Douglas Raillard Date: Wed, 7 Feb 2024 00:37:27 +0000 Subject: [PATCH 3/3] .gitlab-ci.yml: Install pip when necessary --- .gitlab-ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index ffd2b1a42..b91e6380c 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -94,7 +94,7 @@ Autobranch: - sudo apt-get install software-properties-common -y - sudo add-apt-repository ppa:deadsnakes/ppa -y - sudo apt-get update -y - - sudo apt-get -y install python3.${PYVERSION}-full + - sudo apt-get -y install python3.${PYVERSION}-pip python3.${PYVERSION}-full - export LISA_PYTHON=python3.${PYVERSION} - | @@ -197,7 +197,7 @@ pages: - sudo apt-get install software-properties-common -y - sudo add-apt-repository ppa:deadsnakes/ppa -y - sudo apt-get update -y - - sudo apt-get -y install python3.${PYVERSION}-full + - sudo apt-get -y install python3.${PYVERSION}-pip python3.${PYVERSION}-full - export LISA_PYTHON=python3.${PYVERSION} script: -- GitLab