From ed87c10fdc5e0ecc7f2a5cdab689aaa75bda9a1d Mon Sep 17 00:00:00 2001
From: Simon McVittie <smcv@collabora.com>
Date: Fri, 1 Dec 2023 19:00:20 +0000
Subject: [PATCH] CI: Remove meson-dist and cmake-dist build systems

Before we removed the Autotools build system, these meant: do a
`make dist` with Autotools, then unpack the resulting tarball, and build
it with Meson or CMake (as appropriate). This was important because the
contents of an Autotools `make dist` differed significantly from what's
in git: only the files that were explicitly declared as sources in the
Autotools build system were distributed, and Autotools would also add its
own generated cruft.

Now that we're doing releases with Meson, the official source release
artifact is basically `git archive`, so there's much less need to
distinguish between official source releases and what's in git, and these
variant build systems became simple aliases for meson and cmake.
Remove those aliases from tools/ci-build.sh, and stop using them in
.gitlab-ci.yml.

Signed-off-by: Simon McVittie <smcv@collabora.com>
---
 .gitlab-ci.yml    | 6 +++---
 tools/ci-build.sh | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index d1ddd816..9f0ab731 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -173,21 +173,21 @@ debian cmake:
     - .debian-build
   when: manual
   variables:
-    ci_buildsys: "cmake-dist"
+    ci_buildsys: "cmake"
 
 debian meson:
   extends:
     - .meson-common
     - .debian-build
   variables:
-    ci_buildsys: "meson-dist"
+    ci_buildsys: "meson"
 
 debian meson clang debug:
   extends:
     - .meson-common
     - .debian-build
   variables:
-    ci_buildsys: "meson-dist"
+    ci_buildsys: "meson"
     ci_compiler: "clang"
     ci_variant: "debug"
   script:
diff --git a/tools/ci-build.sh b/tools/ci-build.sh
index 239a69a3..b95cfa86 100755
--- a/tools/ci-build.sh
+++ b/tools/ci-build.sh
@@ -228,7 +228,7 @@ make="${make} -j${ci_parallel} V=1 VERBOSE=1"
 export UBSAN_OPTIONS=print_stacktrace=1:print_summary=1:halt_on_error=1
 
 case "$ci_buildsys" in
-    (cmake|cmake-dist)
+    (cmake)
         cmdwrapper=
         cmake=cmake
         case "$ci_host" in
@@ -279,7 +279,7 @@ case "$ci_buildsys" in
         ( cd DESTDIR && find . -ls)
         ;;
 
-    (meson|meson-dist)
+    (meson)
         # The test coverage for OOM-safety is too verbose to be useful on
         # travis-ci, and too slow when running under wine.
         export DBUS_TEST_MALLOC_FAILURES=0