diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index a75b2a140..2918ce62e 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -410,13 +410,15 @@ build_on_fedora_html_docs: -Dsndfile=enabled -Dsession-managers=[] before_script: - - git fetch origin 1.0 1.2 1.4 master + - git fetch origin 1.0 1.2 1.4 1.6 master - git branch -f 1.0 origin/1.0 - git clone -b 1.0 . branch-1.0 - git branch -f 1.2 origin/1.2 - git clone -b 1.2 . branch-1.2 - git branch -f 1.4 origin/1.4 - git clone -b 1.4 . branch-1.4 + - git branch -f 1.6 origin/1.6 + - git clone -b 1.6 . branch-1.6 - git branch -f master origin/master - git clone -b master . branch-master - !reference [.build, before_script] @@ -433,6 +435,10 @@ build_on_fedora_html_docs: - meson setup builddir $MESON_OPTIONS - meson compile -C builddir doc/pipewire-docs - cd .. + - cd branch-1.6 + - meson setup builddir $MESON_OPTIONS + - meson compile -C builddir doc/pipewire-docs + - cd .. - cd branch-master - meson setup builddir $MESON_OPTIONS - meson compile -C builddir doc/pipewire-docs @@ -682,12 +688,13 @@ pages: - job: build_on_fedora_html_docs artifacts: true script: - - mkdir public public/1.0 public/1.2 public/1.4 public/devel + - mkdir public public/1.0 public/1.2 public/1.4 public/1.6 public/devel - cp -R branch-1.0/builddir/doc/html/* public/1.0/ - cp -R branch-1.2/builddir/doc/html/* public/1.2/ - cp -R branch-1.4/builddir/doc/html/* public/1.4/ + - cp -R branch-1.6/builddir/doc/html/* public/1.6/ - cp -R branch-master/builddir/doc/html/* public/devel/ - - (cd public && ln -s 1.4/* .) + - (cd public && ln -s 1.6/* .) artifacts: paths: - public diff --git a/doc/DoxygenLayout.xml b/doc/DoxygenLayout.xml index 300c8400e..10da55da5 100644 --- a/doc/DoxygenLayout.xml +++ b/doc/DoxygenLayout.xml @@ -44,6 +44,7 @@ +