update master

.gitlab-ci.yml

@@ -2,7 +2,7 @@
 # container and push it to the project's container registry on fd.o GitLab.
 # This step is only run when the tag for the container changes, else it is
 # effectively a no-op. All of this infrastructure is inherited from the
-# wayland/ci-templates repository which is the recommended way to set up CI
+# freedesktop/ci-templates repository which is the recommended way to set up CI
 # infrastructure on fd.o GitLab.
 #
 # Once the container stage is done, we move on to the 'build' stage where we
@@ -19,22 +19,26 @@ variables:
   # CI runs, for example when adding new packages to FDO_DISTRIBUTION_PACKAGES.
   # The tag is an arbitrary string that identifies the exact container
   # contents.
+<<<<<<< HEAD
   FDO_DISTRIBUTION_TAG: '2021-03-01-02'
   FDO_DISTRIBUTION_VERSION: '18.04'
+=======
+  FDO_DISTRIBUTION_TAG: '2023-08-13-00'
+  FDO_DISTRIBUTION_VERSION: '20.04'
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
   FDO_UPSTREAM_REPO: 'pulseaudio/pulseaudio'
-  UBUNTU_IMAGE: "$CI_REGISTRY_IMAGE/ubuntu/$FDO_DISTRIBUTION_VERSION:$FDO_DISTRIBUTION_TAG"
 
 include:
   # We pull templates from master to avoid the overhead of periodically
   # scanning for changes upstream. This does means builds might occasionally
   # break due to upstream changing things, so if you see unexpected build
   # failures, this might be one cause.
-  - project: 'wayland/ci-templates'
+  - project: 'freedesktop/ci-templates'
     ref: 'master'
     file: '/templates/ubuntu.yml'
 
 build-container:
-  extends: .fdo.container-ifnot-exists@ubuntu
+  extends: .fdo.container-build@ubuntu
   stage: container
   variables:
     GIT_STRATEGY: none # no need to pull the whole tree for rebuilding the image
@@ -48,6 +52,7 @@ build-container:
       check
       curl
       dbus-x11
+      doxygen
       g++
       gcc
       gettext
@@ -88,17 +93,17 @@ build-container:
       wget
 
 build-meson:
+  extends: .fdo.distribution-image@ubuntu
   stage: build
-  image: $UBUNTU_IMAGE
   script:
-    # Install meson
-    - wget -q https://github.com/mesonbuild/meson/releases/download/0.50.0/meson-0.50.0.tar.gz
-    - tar -xf meson-0.50.0.tar.gz
-    - cd meson-0.50.0
+    # Install meson (higher than our min version to support our wrap file)
+    - wget -q https://github.com/mesonbuild/meson/releases/download/0.63.2/meson-0.63.2.tar.gz
+    - tar -xf meson-0.63.2.tar.gz
+    - cd meson-0.63.2
     - python3 setup.py install
     - cd ..
     # Do the actual build
-    - meson build
+    - meson build -Dwebrtc-aec=enabled
     - cd build
     - ninja
     - ulimit -c 0 # don't dump core files on tests that are supposed to assert