[gobject-introspection/ebassi/issue-319: 11/13] ci: Install mako and markup modules in Docker




commit 2b98e9b7158e165a4ec6ff29bfc204ea5480c16c
Author: Emmanuele Bassi <ebassi gnome org>
Date:   Wed Jun 23 23:43:29 2021 +0100

    ci: Install mako and markup modules in Docker
    
    Don't install them as part of the CI job. It's pointless repetition.

 .gitlab-ci.yml        | 5 -----
 .gitlab-ci/Dockerfile | 2 ++
 2 files changed, 2 insertions(+), 5 deletions(-)
---
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 7f2d476f..5f455f50 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -16,7 +16,6 @@ example-meson:
   variables:
     EXTRA_MESON_FLAGS: "-Ddoctool=enabled -Dgtk_doc=true"
   script:
-    - python3 -m pip install --user mako markdown
     - meson setup ${COMMON_MESON_FLAGS} ${EXTRA_MESON_FLAGS} _build .
     - meson compile -C _build
     - sudo meson install -C _build
@@ -36,7 +35,6 @@ example-autotools:
   variables:
     EXTRA_MESON_FLAGS: "-Ddoctool=enabled -Dgtk_doc=true"
   script:
-    - python3 -m pip install --user mako markdown
     - meson setup ${COMMON_MESON_FLAGS} ${EXTRA_MESON_FLAGS} _build .
     - meson compile -C _build
     - sudo meson install -C _build
@@ -54,7 +52,6 @@ fedora-x86_64-meson:
     CCACHE_DIR: "${CI_PROJECT_DIR}/_ccache"
     EXTRA_MESON_FLAGS: "-Ddoctool=enabled -Dgtk_doc=true -Dwerror=true"
   script:
-    - python3 -m pip install --user mako markdown
     - meson setup ${COMMON_MESON_FLAGS} ${EXTRA_MESON_FLAGS} _build .
     - meson compile -C _build
     - meson test -C _build --print-errorlogs --suite=gobject-introspection --no-suite=glib
@@ -99,7 +96,6 @@ fedora-x86_64-no-introspection-data:
     CCACHE_DIR: "${CI_PROJECT_DIR}/_ccache"
     EXTRA_MESON_FLAGS: "-Dwerror=true"
   script:
-    - python3 -m pip install --user mako markdown
     - meson setup ${COMMON_MESON_FLAGS} ${EXTRA_MESON_FLAGS} _build .
     - meson compile -C _build
     - meson test -C _build --print-errorlogs --suite=gobject-introspection --no-suite=glib
@@ -119,7 +115,6 @@ fedora-x86_64-python3.6:
     CCACHE_DIR: "${CI_PROJECT_DIR}/_ccache"
     PYENV_VERSION: "3.6.12"
   script:
-    - python3 -m pip install --user mako markdown
     - meson setup ${COMMON_MESON_FLAGS} ${EXTRA_MESON_FLAGS} _build .
     - meson compile -C _build
     - meson test -C _build --print-errorlogs --suite=gobject-introspection --no-suite=glib
diff --git a/.gitlab-ci/Dockerfile b/.gitlab-ci/Dockerfile
index 7f640b56..bab05281 100644
--- a/.gitlab-ci/Dockerfile
+++ b/.gitlab-ci/Dockerfile
@@ -39,6 +39,8 @@ RUN dnf -y install \
     pcre-devel \
     python3 \
     python3-devel \
+    python3-mako \
+    python3-markdown \
     python3-pip \
     python3-wheel \
     readline-devel \


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]