From 2124180db5ac7d4912097711684a77686e3044d4 Mon Sep 17 00:00:00 2001
From: Rylie Pavlik <rylie.pavlik@collabora.com>
Date: Thu, 21 Mar 2024 10:43:34 -0500
Subject: [PATCH] ci: Update instructions to use pipx

---
 .gitlab-ci/README.md           | 4 ++--
 .gitlab-ci/install-ci-fairy.sh | 6 ++++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/.gitlab-ci/README.md b/.gitlab-ci/README.md
index 4e89a2344..a2d0d3fa6 100644
--- a/.gitlab-ci/README.md
+++ b/.gitlab-ci/README.md
@@ -1,7 +1,7 @@
 # CI and Generated Stuff Readme
 
 <!--
-# Copyright 2018-2023 Collabora, Ltd. and the Monado contributors
+# Copyright 2018-2024, Collabora, Ltd. and the Monado contributors
 #
 # SPDX-License-Identifier: CC0-1.0
 -->
@@ -16,7 +16,7 @@ You can install it with:
 
 <!-- do not break the following line, it is used in CI setup too, to make sure it works -->
 ```sh
-python3 -m pip install git+https://gitlab.freedesktop.org/freedesktop/ci-templates@185ede0e9b9b1924b92306ab8b882a6294e92613
+pipx install git+https://gitlab.freedesktop.org/freedesktop/ci-templates@185ede0e9b9b1924b92306ab8b882a6294e92613
 ```
 
 On Windows you will also need to have GNU make and busybox installed, such as with:
diff --git a/.gitlab-ci/install-ci-fairy.sh b/.gitlab-ci/install-ci-fairy.sh
index bb6e3392b..44aa93252 100755
--- a/.gitlab-ci/install-ci-fairy.sh
+++ b/.gitlab-ci/install-ci-fairy.sh
@@ -1,11 +1,13 @@
 #!/bin/sh
 # SPDX-License-Identifier: CC0-1.0
-# SPDX-FileCopyrightText: 2018-2022 Collabora, Ltd. and the Monado contributors
+# SPDX-FileCopyrightText: 2018-2024, Collabora, Ltd. and the Monado contributors
 
 # This runs the command in the README as an extra bit of continuous integration.
 set -e
 
 (
     cd "$(dirname "$0")"
-    sh -c "$(grep '^python3 -m pip' README.md)"
+    # Getting the path set up right for pipx in CI is a hassle.
+    # This script is usage on the CI itself only!
+    sh -c "$(grep '^pipx' README.md | sed 's/pipx install/python3 -m pip install --break-system-packages/' )"
 )