From 279fd481c2ec7085e87feb48b6098c10518cb9b1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pablo=20Correa=20G=C3=B3mez?= <ablocorrea@hotmail.com>
Date: Wed, 18 Sep 2024 20:25:44 +0200
Subject: [PATCH] ci: update image to 47 fix-branch, and install git in
 container

---
 .github/Dockerfile                  | 5 +++--
 .github/workflows/docker-image.yaml | 2 +-
 .github/workflows/unittests.yaml    | 2 +-
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/.github/Dockerfile b/.github/Dockerfile
index bd4f075..23a4b19 100644
--- a/.github/Dockerfile
+++ b/.github/Dockerfile
@@ -1,13 +1,13 @@
 FROM ghcr.io/distroless/alpine-base:latest
 
-ENV BRANCH=profiler-private
+ENV BRANCH=appstream-plugin-fixes
 # distroless/alpine-base only has main by default
 RUN echo "" >> /etc/apk/repositories \
     && echo https://dl-cdn.alpinelinux.org/alpine/edge/community >> /etc/apk/repositories
 RUN apk add --no-cache meson apk-polkit-rs-dev build-base \
     curl gdk-pixbuf-dev libxmlb-dev glib-dev gtk4.0-dev libadwaita-dev \
     json-glib-dev libsoup3-dev gspell-dev polkit-dev libgudev-dev appstream-dev \
-    desktop-file-utils gsettings-desktop-schemas-dev dbus
+    desktop-file-utils gsettings-desktop-schemas-dev dbus git itstool
 RUN curl -L -O https://gitlab.gnome.org/pabloyoyoista/gnome-software/-/archive/${BRANCH}/gnome-software-${BRANCH}.tar.gz \
     && tar xf gnome-software-${BRANCH}.tar.gz \
     && cd gnome-software-${BRANCH} \
@@ -23,6 +23,7 @@ RUN curl -L -O https://gitlab.gnome.org/pabloyoyoista/gnome-software/-/archive/$
        -Dgtk_doc=false \
        -Dman=false \
        -Dtests=false \
+       -Dsysprof=disabled \
         build \
     && meson install -C build
 RUN apk add --no-cache py3-dbusmock
diff --git a/.github/workflows/docker-image.yaml b/.github/workflows/docker-image.yaml
index 98fb38e..b21934c 100644
--- a/.github/workflows/docker-image.yaml
+++ b/.github/workflows/docker-image.yaml
@@ -10,7 +10,7 @@ on:
 env:
   REGISTRY: ghcr.io
   IMAGE_NAME: cogitri/gnome-software-plugin-apk-ci
-  VERSION: 43
+  VERSION: 47
 
 jobs:
   build-test-and-push-image:
diff --git a/.github/workflows/unittests.yaml b/.github/workflows/unittests.yaml
index c6300cf..8b3ed4a 100644
--- a/.github/workflows/unittests.yaml
+++ b/.github/workflows/unittests.yaml
@@ -10,7 +10,7 @@ jobs:
     permissions:
       packages: read
     container:
-      image: ghcr.io/cogitri/gnome-software-plugin-apk-ci:43
+      image: ghcr.io/cogitri/gnome-software-plugin-apk-ci:47
       credentials:
         username: cogitri
         password: ${{ secrets.GITHUB_TOKEN }}