diff options
| author | Patrick Griffis <pgriffis@igalia.com> | 2020-11-25 12:29:51 -0600 |
|---|---|---|
| committer | Patrick Griffis <pgriffis@igalia.com> | 2020-11-25 14:21:58 -0600 |
| commit | 9c5faf7863e3712c2802f7011c413093ecd0b0aa (patch) | |
| tree | 5ddaabc3bcacbd3378f459bfa65657fbffe54d21 | |
| parent | 924069e946c444ed7055959cc1ef5e997cb0619c (diff) | |
| download | libsoup-9c5faf7863e3712c2802f7011c413093ecd0b0aa.tar.gz | |
ci: Update to Fedora 33 and add sysprof
| -rw-r--r-- | .gitlab-ci.yml | 2 | ||||
| -rw-r--r-- | .gitlab-ci/Dockerfile | 18 | ||||
| -rwxr-xr-x | .gitlab-ci/run-docker.sh | 2 |
3 files changed, 17 insertions, 5 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 02d9c82c..25f54020 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,4 +1,4 @@ -image: registry.gitlab.gnome.org/gnome/libsoup/master:v7 +image: registry.gitlab.gnome.org/gnome/libsoup/master:v8 stages: - build diff --git a/.gitlab-ci/Dockerfile b/.gitlab-ci/Dockerfile index c3be5666..ad34b9b6 100644 --- a/.gitlab-ci/Dockerfile +++ b/.gitlab-ci/Dockerfile @@ -1,8 +1,8 @@ -FROM fedora:31 +FROM fedora:33 RUN dnf update -y \ && dnf install -y 'dnf-command(builddep)' \ - && dnf builddep -y libsoup glib2 \ + && dnf builddep -y libsoup glib2 gobject-introspection vala \ && dnf install -y brotli-devel \ git \ gtk-doc \ @@ -19,13 +19,25 @@ RUN dnf update -y \ clang-analyzer \ valgrind \ libasan \ + sysprof-devel \ + autoconf-archive \ && dnf clean all \ && git clone https://gitlab.gnome.org/GNOME/glib.git \ && pushd glib \ && meson _build --prefix=/usr \ && meson install -C _build \ && popd \ - && rm -rf glib + && git clone https://gitlab.gnome.org/GNOME/gobject-introspection.git \ + && pushd gobject-introspection \ + && meson _build --prefix=/usr \ + && meson install -C _build \ + && popd \ + && git clone https://gitlab.gnome.org/GNOME/vala.git \ + && pushd vala \ + && ./autogen.sh --prefix=/usr \ + && make install \ + && popd \ + && rm -rf glib gobject-introspection vala 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 93b6009a..a917a940 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/libsoup/master:v7" +TAG="registry.gitlab.gnome.org/gnome/libsoup/master:v8" cd "$(dirname "$0")" podman build --build-arg HOST_USER_ID="$UID" --tag "${TAG}" --file "Dockerfile" --format=docker . |