From d1768c556d2120741c8d6da675d54037f03159fb Mon Sep 17 00:00:00 2001
From: Emmanuele Bassi <ebassi@gnome.org>
Date: Thu, 24 Mar 2022 11:56:56 +0000
Subject: ci: Install Meson globally

So we don't need ancillary scripts to build ATK.
---
 .gitlab-ci.yml                      | 4 ++--
 .gitlab-ci/debian-stable.Dockerfile | 4 ++--
 .gitlab-ci/fedora-latest.Dockerfile | 4 ++--
 .gitlab-ci/run-tests-docker.sh      | 2 --
 .gitlab-ci/setup-build-docker.sh    | 8 --------
 5 files changed, 6 insertions(+), 16 deletions(-)
 delete mode 100755 .gitlab-ci/setup-build-docker.sh

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 890768e..806e086 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -14,7 +14,7 @@ variables:
 
 .default-build:
   script:
-    - .gitlab-ci/setup-build-docker.sh
+    - meson setup ${COMMON_MESON_FLAGS} _build .
     - meson compile -C _build
     - .gitlab-ci/run-tests-docker.sh _build
   artifacts:
@@ -47,7 +47,7 @@ reference:
   variables:
     EXTRA_MESON_FLAGS: "--buildtype=release -Ddocs=true"
   script:
-    - .gitlab-ci/setup-build-docker.sh
+    - meson setup ${COMMON_MESON_FLAGS} _build .
     - ninja -C _build atk-doc
     - mv _build/docs/html _reference
   artifacts:
diff --git a/.gitlab-ci/debian-stable.Dockerfile b/.gitlab-ci/debian-stable.Dockerfile
index bde2607..23c8318 100644
--- a/.gitlab-ci/debian-stable.Dockerfile
+++ b/.gitlab-ci/debian-stable.Dockerfile
@@ -32,6 +32,8 @@ RUN apt-get update -qq && apt-get install --no-install-recommends -qq -y \
 # Locale for our build
 RUN locale-gen C.UTF-8 && /usr/sbin/update-locale LANG=C.UTF-8
 
+RUN pip3 install meson==0.52
+
 ARG HOST_USER_ID=5555
 ENV HOST_USER_ID ${HOST_USER_ID}
 RUN useradd -u $HOST_USER_ID -ms /bin/bash user
@@ -39,6 +41,4 @@ RUN useradd -u $HOST_USER_ID -ms /bin/bash user
 USER user
 WORKDIR /home/user
 
-RUN pip3 install --user meson==0.52
-
 ENV LANG=C.UTF-8 LANGUAGE=C.UTF-8 LC_ALL=C.UTF-8
diff --git a/.gitlab-ci/fedora-latest.Dockerfile b/.gitlab-ci/fedora-latest.Dockerfile
index 24f476c..9927e8d 100644
--- a/.gitlab-ci/fedora-latest.Dockerfile
+++ b/.gitlab-ci/fedora-latest.Dockerfile
@@ -26,6 +26,8 @@ RUN dnf -y install \
     xorg-x11-server-Xvfb \
     && dnf clean all
 
+RUN pip3 install meson==0.52
+
 ARG HOST_USER_ID=5555
 ENV HOST_USER_ID ${HOST_USER_ID}
 RUN useradd -u $HOST_USER_ID -ms /bin/bash user
@@ -33,6 +35,4 @@ RUN useradd -u $HOST_USER_ID -ms /bin/bash user
 USER user
 WORKDIR /home/user
 
-RUN pip3 install --user meson==0.52
-
 ENV LANG C.utf8
diff --git a/.gitlab-ci/run-tests-docker.sh b/.gitlab-ci/run-tests-docker.sh
index b35dd6e..147299a 100755
--- a/.gitlab-ci/run-tests-docker.sh
+++ b/.gitlab-ci/run-tests-docker.sh
@@ -6,8 +6,6 @@ set +e
 srcdir=$( pwd )
 builddir=$1
 
-export PATH="${HOME}/.local/bin:${PATH}"
-
 meson test -C ${builddir} \
         --print-errorlogs
 
diff --git a/.gitlab-ci/setup-build-docker.sh b/.gitlab-ci/setup-build-docker.sh
deleted file mode 100755
index 96fd6d2..0000000
--- a/.gitlab-ci/setup-build-docker.sh
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/bash
-
-set +e
-set +x
-
-export PATH="${HOME}/.local/bin:${PATH}"
-
-meson ${EXTRA_MESON_FLAGS:-} _build .
-- 
cgit v1.2.1