[vlc-commits] [Git][videolan/vlc][master] 3 commits: CI: pages: do not extend base template

[Steve Lhomme (@robUx4)]

Steve Lhomme pushed to branch master at VideoLAN / VLC


Commits:
6cdd1dcb by Marvin Scholz at 2026-03-16T04:03:03+00:00
CI: pages: do not extend base template

There is nothing in the base template that is relevant here  as
everything gets overwritten.

- - - - -
f9ef436d by Marvin Scholz at 2026-03-16T04:03:03+00:00
CI: pages: rename job and use explicit syntax

Instead of the (legacy) implicit detection of pages job via the job
name, use the more explicit pages.publish supported since GitLab 17.9
and remove the artifacts section as pages.publish appends the entry to
artifacts.paths since GitLab 17.10.

- - - - -
16996d7c by Marvin Scholz at 2026-03-16T04:03:03+00:00
CI: nightly-docs: generate branch docs in one job

Limit the nightly docs job to only run in the default branch and
instead run it for the branches we care about. This avoids that
the deployed documentation randomly switches between master and 4.x
depending on which nightly job ran last.

- - - - -


1 changed file:

- extras/ci/gitlab-ci.yml


Changes:

=====================================
extras/ci/gitlab-ci.yml
=====================================
@@ -667,17 +667,27 @@ wasm32-emscripten-build :
 #
 # VLC Documentation
 #
-pages:
-    extends: .base-template
+nightly-docs:
+    stage: build
     image:
         name: $VLC_DEBIAN_IMAGE
+    before_script:
+        - git fetch --all
     script:
-        - ./bootstrap
-        - ./configure
-        - make doc
-        - mv doc/doxygen/html public
-    artifacts:
-        paths:
-            - public
+        - mkdir public
+        - |
+            for branch in "$CI_DEFAULT_BRANCH" '3.0.x' ; do
+              echo -e "\e[0Ksection_start:$(date +%s):nightly_docs_build_${branch}\r\e[0KBuilding docs for ${branch}"
+              git switch --detach "origin/$branch"
+              ./bootstrap
+              ./configure
+              make doc
+              mv doc/doxygen/html "public/$branch"
+              make distclean
+              echo -e "\e[0Ksection_end:$(date +%s):nightly_docs_build_${branch}\r\e[0K"
+            done
+        - echo "/vlc /vlc/$CI_DEFAULT_BRANCH 302" > 'public/_redirects'
+    pages:
+        publish: public
     rules:
-        - if: '$CI_PIPELINE_SOURCE == "schedule"'
+        - if: '$CI_PIPELINE_SOURCE == "schedule" && $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH'



View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/8e228d99954625f59ddbd5aa35da4fe567795d02...16996d7c9b05905edc5be46a966b669b33b2206b

-- 
View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/8e228d99954625f59ddbd5aa35da4fe567795d02...16996d7c9b05905edc5be46a966b669b33b2206b
You're receiving this email because of your account on code.videolan.org.


VideoLAN code repository instance