[gobject-introspection/ci-fedora29] gitlab-ci: Update the docker image to use fedora 29 and the latest meson
- From: Christoph Reiter <creiter src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gobject-introspection/ci-fedora29] gitlab-ci: Update the docker image to use fedora 29 and the latest meson
- Date: Thu, 22 Nov 2018 06:42:50 +0000 (UTC)
commit 61cf8a574dd2015b697c7decc37558739837526b
Author: Christoph Reiter <reiter christoph gmail com>
Date: Thu Nov 22 07:36:57 2018 +0100
gitlab-ci: Update the docker image to use fedora 29 and the latest meson
.gitlab-ci/Dockerfile | 4 ++--
.gitlab-ci/run-docker.sh | 2 +-
.gitlab-ci/test-msvc.bat | 2 +-
.gitlab-ci/test-msys2.sh | 2 +-
4 files changed, 5 insertions(+), 5 deletions(-)
---
diff --git a/.gitlab-ci/Dockerfile b/.gitlab-ci/Dockerfile
index 0066675a..cac13eb0 100644
--- a/.gitlab-ci/Dockerfile
+++ b/.gitlab-ci/Dockerfile
@@ -1,4 +1,4 @@
-FROM fedora:28
+FROM fedora:29
RUN dnf -y install \
autoconf \
@@ -47,7 +47,7 @@ RUN dnf -y install \
zlib-devel \
&& dnf clean all
-RUN pip3 install meson==0.48.0
+RUN pip3 install meson==0.48.2
ARG HOST_USER_ID=5555
ENV HOST_USER_ID ${HOST_USER_ID}
diff --git a/.gitlab-ci/run-docker.sh b/.gitlab-ci/run-docker.sh
index 31c49a2c..a087927c 100755
--- a/.gitlab-ci/run-docker.sh
+++ b/.gitlab-ci/run-docker.sh
@@ -2,7 +2,7 @@
set -e
-TAG="registry.gitlab.gnome.org/gnome/gobject-introspection:v2"
+TAG="registry.gitlab.gnome.org/gnome/gobject-introspection:v3"
sudo docker build --build-arg HOST_USER_ID="$UID" --tag "${TAG}" \
--file "Dockerfile" .
diff --git a/.gitlab-ci/test-msvc.bat b/.gitlab-ci/test-msvc.bat
index 1d80590b..cb916801 100644
--- a/.gitlab-ci/test-msvc.bat
+++ b/.gitlab-ci/test-msvc.bat
@@ -10,7 +10,7 @@ py -3 -m zipfile -e pkg-config-lite-0.28-1.zip .
SET PATH=%CD%\pkg-config-lite-0.28-1\bin;%CD%\win_flex_bison;%PATH%
-pip3 install --upgrade --user meson==0.48.0 || goto :error
+pip3 install --upgrade --user meson==0.48.2 || goto :error
meson _build || goto :error
ninja -C _build || goto :error
diff --git a/.gitlab-ci/test-msys2.sh b/.gitlab-ci/test-msys2.sh
index 478eee91..9c5abe3e 100644
--- a/.gitlab-ci/test-msys2.sh
+++ b/.gitlab-ci/test-msys2.sh
@@ -29,7 +29,7 @@ pacman --noconfirm -S --needed \
export CCACHE_BASEDIR="${CI_PROJECT_DIR}"
export CCACHE_DIR="${CCACHE_BASEDIR}/_ccache"
-pip3 install --upgrade --user meson==0.48.0 flake8
+pip3 install --upgrade --user meson==0.48.2 flake8
export PATH="$HOME/.local/bin:$PATH"
# FIXME: https://github.com/Alexpux/MINGW-packages/pull/4064
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]