gitlab-ci: drop gettext from the build images

Suggested-by: Pierre-Eric Pelloux-Prayer <pelloux@gmail.com>
Signed-off-by: Eric Engestrom <eric@engestrom.ch>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/5440>

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index cc369a924ec427e01245df8111f17de0e929f7b5..1ec16c77b01ca153ac1a2365c97df8e83a2636c0 100644 (file)
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -150,7 +150,7 @@ x86_build-base:
     - .fdo.container-build@debian
     - .container
   variables:
-    FDO_DISTRIBUTION_TAG: &x86_build-base "2020-06-02"
+    FDO_DISTRIBUTION_TAG: &x86_build-base "2020-06-12"
 
 .use-x86_build-base:
   extends:
@@ -256,7 +256,7 @@ x86_test-vk:
 x86_build_old:
   extends: x86_build-base
   variables:
-    FDO_DISTRIBUTION_TAG: &x86_build_old "2020-06-02"
+    FDO_DISTRIBUTION_TAG: &x86_build_old "2020-06-12"
     FDO_DISTRIBUTION_VERSION: stretch-slim
 
 .use-x86_build_old:
@@ -272,7 +272,7 @@ arm_build:
     - .fdo.container-build@debian@arm64v8
     - .container
   variables:
-    FDO_DISTRIBUTION_TAG: &arm_build "2020-06-01"
+    FDO_DISTRIBUTION_TAG: &arm_build "2020-06-12"
 
 .use-arm_build:
   variables:

diff --git a/.gitlab-ci/container/arm_build.sh b/.gitlab-ci/container/arm_build.sh
index 58dd0e1bdd9bc90b6ca1554cb779d79087cb80a7..6facab31e734b3de7f514c044fcadf9c60fcadac 100644 (file)
--- a/.gitlab-ci/container/arm_build.sh
+++ b/.gitlab-ci/container/arm_build.sh
@@ -22,7 +22,6 @@ apt-get -y install \
        fastboot \
        flex \
        g++ \
-       gettext \
        git \
        lavacli \
        libdrm-dev:armhf \

diff --git a/.gitlab-ci/container/x86_build-base.sh b/.gitlab-ci/container/x86_build-base.sh
index 2350aca8843383d3aeec08905824382b65f1cdbc..c904f34ebabf29de7de731ea9ffa91318611a8fa 100644 (file)
--- a/.gitlab-ci/container/x86_build-base.sh
+++ b/.gitlab-ci/container/x86_build-base.sh
@@ -30,7 +30,6 @@ apt-get install -y --no-remove \
         g++ \
         g++-mingw-w64-x86-64 \
         gcc \
-        gettext \
         libclang-9-dev \
         libclc-dev \
         libelf-dev \

diff --git a/.gitlab-ci/container/x86_build_old.sh b/.gitlab-ci/container/x86_build_old.sh
index 4f9c83b05f4bad3a220aff492a073d8455ed7e9a..3343fbb24496051de5c1247ff830593b27a99b96 100644 (file)
--- a/.gitlab-ci/container/x86_build_old.sh
+++ b/.gitlab-ci/container/x86_build_old.sh
@@ -30,7 +30,6 @@ apt-get install -y --no-remove \
       flex \
       g++ \
       gcc \
-      gettext \
       git \
       libclang-3.9-dev \
       libclang-4.0-dev \