diff options
| author | Aleksei Rybalkin <aleksei@rybalkin.org> | 2022-07-12 11:46:34 +0000 |
|---|---|---|
| committer | Philip Withnall <philip@tecnocode.co.uk> | 2022-07-12 11:46:34 +0000 |
| commit | 8d5a44dc8f36cce270519bd52fcecf330ccb43b4 (patch) | |
| tree | 0f0675dbccad74c046e728bb692be3f7062ca92c /.gitlab-ci | |
| parent | e5f3b08b54c32da0af5f794dfb4a699f73d151b3 (diff) | |
| download | glib-8d5a44dc8f36cce270519bd52fcecf330ccb43b4.tar.gz | |
replace pcre1 with pcre2
Diffstat (limited to '.gitlab-ci')
| -rw-r--r-- | .gitlab-ci/coverity.Dockerfile | 2 | ||||
| -rw-r--r-- | .gitlab-ci/debian-stable.Dockerfile | 1 | ||||
| -rw-r--r-- | .gitlab-ci/fedora.Dockerfile | 1 | ||||
| -rw-r--r-- | .gitlab-ci/mingw.Dockerfile | 1 | ||||
| -rwxr-xr-x | .gitlab-ci/test-msys2.sh | 1 |
5 files changed, 1 insertions, 5 deletions
diff --git a/.gitlab-ci/coverity.Dockerfile b/.gitlab-ci/coverity.Dockerfile index 5ee757e2d..241861ec9 100644 --- a/.gitlab-ci/coverity.Dockerfile +++ b/.gitlab-ci/coverity.Dockerfile @@ -1,4 +1,4 @@ -FROM registry.gitlab.gnome.org/gnome/glib/fedora:v17 +FROM registry.gitlab.gnome.org/gnome/glib/fedora:v18 ARG COVERITY_SCAN_PROJECT_NAME ARG COVERITY_SCAN_TOKEN diff --git a/.gitlab-ci/debian-stable.Dockerfile b/.gitlab-ci/debian-stable.Dockerfile index 0622aa26b..5dcf2d3c2 100644 --- a/.gitlab-ci/debian-stable.Dockerfile +++ b/.gitlab-ci/debian-stable.Dockerfile @@ -26,7 +26,6 @@ RUN apt-get update -qq && apt-get install --no-install-recommends -qq -y \ libelf-dev \ libffi-dev \ libmount-dev \ - libpcre3-dev \ libpcre2-dev \ libselinux1-dev \ libxml2-utils \ diff --git a/.gitlab-ci/fedora.Dockerfile b/.gitlab-ci/fedora.Dockerfile index b83a34c8c..2506f9386 100644 --- a/.gitlab-ci/fedora.Dockerfile +++ b/.gitlab-ci/fedora.Dockerfile @@ -43,7 +43,6 @@ RUN dnf -y update \ libxslt \ ncurses-compat-libs \ ninja-build \ - pcre-devel \ pcre2-devel \ "python3-dbusmock >= 0.18.3-2" \ python3-pip \ diff --git a/.gitlab-ci/mingw.Dockerfile b/.gitlab-ci/mingw.Dockerfile index 5fe5e67de..b109122fc 100644 --- a/.gitlab-ci/mingw.Dockerfile +++ b/.gitlab-ci/mingw.Dockerfile @@ -43,7 +43,6 @@ RUN dnf -y install \ mingw64-zlib \ ncurses-compat-libs \ ninja-build \ - pcre-devel \ pcre2-devel \ python3 \ python3-pip \ diff --git a/.gitlab-ci/test-msys2.sh b/.gitlab-ci/test-msys2.sh index d891ee008..a345fda6a 100755 --- a/.gitlab-ci/test-msys2.sh +++ b/.gitlab-ci/test-msys2.sh @@ -18,7 +18,6 @@ pacman --noconfirm -S --needed \ mingw-w64-$MSYS2_ARCH-gettext \ mingw-w64-$MSYS2_ARCH-libffi \ mingw-w64-$MSYS2_ARCH-meson \ - mingw-w64-$MSYS2_ARCH-pcre \ mingw-w64-$MSYS2_ARCH-pcre2 \ mingw-w64-$MSYS2_ARCH-python3 \ mingw-w64-$MSYS2_ARCH-python-pip \ |