From ef10848a2804cc05ee9cbd2f9d7d2514b77f9c73 Mon Sep 17 00:00:00 2001
From: Tiago Nobrega <tiago.nobrega@canonical.com>
Date: Fri, 19 Jan 2024 15:14:34 -0300
Subject: [PATCH] build(deps): bump craft-cli to 2.5.1 (#4528)

This new version fixes decoding issues when parsing malformed output
from other processes (typically during the build step)

Fixes #4515
---
 docs/requirements.txt                           |  2 +-
 requirements-devel.txt                          |  2 +-
 requirements.txt                                |  2 +-
 tests/spread/core22/invalid-utf8/snapcraft.yaml | 12 ++++++++++++
 tests/spread/core22/invalid-utf8/task.yaml      |  8 ++++++++
 5 files changed, 23 insertions(+), 3 deletions(-)
 create mode 100644 tests/spread/core22/invalid-utf8/snapcraft.yaml
 create mode 100644 tests/spread/core22/invalid-utf8/task.yaml

diff --git a/docs/requirements.txt b/docs/requirements.txt
index 27cd12f62a..df4783e77d 100644
--- a/docs/requirements.txt
+++ b/docs/requirements.txt
@@ -2,7 +2,7 @@ attrs==23.1.0
 catkin-pkg==0.5.2
 click==8.1.7
 craft-archives==1.1.3
-craft-cli==2.5.0
+craft-cli==2.5.1
 craft-grammar==1.1.1
 craft-parts==1.26.0
 craft-providers==1.20.1
diff --git a/requirements-devel.txt b/requirements-devel.txt
index 4012286e51..6fb68a765b 100644
--- a/requirements-devel.txt
+++ b/requirements-devel.txt
@@ -12,7 +12,7 @@ codespell==2.2.6
 colorama==0.4.6
 coverage==7.4.0
 craft-archives==1.1.3
-craft-cli==2.5.0
+craft-cli==2.5.1
 craft-grammar==1.1.2
 craft-parts==1.26.1
 craft-providers==1.20.1
diff --git a/requirements.txt b/requirements.txt
index 26fb74f92d..6412f5467e 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -6,7 +6,7 @@ chardet==5.2.0
 charset-normalizer==3.3.2
 click==8.1.7
 craft-archives==1.1.3
-craft-cli==2.5.0
+craft-cli==2.5.1
 craft-grammar==1.1.2
 craft-parts==1.26.1
 craft-providers==1.20.1
diff --git a/tests/spread/core22/invalid-utf8/snapcraft.yaml b/tests/spread/core22/invalid-utf8/snapcraft.yaml
new file mode 100644
index 0000000000..158de500f5
--- /dev/null
+++ b/tests/spread/core22/invalid-utf8/snapcraft.yaml
@@ -0,0 +1,12 @@
+name: invalid-utf8
+base: core22
+summary: a project that echos invalid utf-8 text
+description: a project that echos invalid utf-8 text
+version: "1.0"
+confinement: strict
+
+parts:
+  my-part:
+    plugin: nil
+    override-build: |
+      echo -e "hi \x96 bye"
diff --git a/tests/spread/core22/invalid-utf8/task.yaml b/tests/spread/core22/invalid-utf8/task.yaml
new file mode 100644
index 0000000000..b842c4f1fa
--- /dev/null
+++ b/tests/spread/core22/invalid-utf8/task.yaml
@@ -0,0 +1,8 @@
+summary: Handle invalid utf-8 text during the build
+
+restore: |
+  snapcraft clean
+  rm -f ./*.snap
+
+execute: |
+  snapcraft pack -v 2>&1 | MATCH ":: hi � bye"