From a31688b0f2d20a82cd9e0bc83e255f9f5eb9ff83 Mon Sep 17 00:00:00 2001
From: Wojciech Kozlowski <wk@wojciechkozlowski.eu>
Date: Sat, 24 Aug 2024 15:21:34 +0200
Subject: [PATCH 1/3] Update beets to 2.0.0 in CI

---
 .gitea/images/Dockerfile       | 6 ++++--
 .gitea/workflows/gitea-ci.yaml | 4 ++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/.gitea/images/Dockerfile b/.gitea/images/Dockerfile
index f460b68..881bd65 100644
--- a/.gitea/images/Dockerfile
+++ b/.gitea/images/Dockerfile
@@ -9,5 +9,7 @@ RUN cargo install \
   grcov
 
 RUN apt-get update && apt-get install -y \
-  beets \
-  nodejs
+  nodejs \
+  pipx
+
+RUN pipx install --include-deps --system-site-packages beets==2.0.0
diff --git a/.gitea/workflows/gitea-ci.yaml b/.gitea/workflows/gitea-ci.yaml
index 0af064c..dbd86fb 100644
--- a/.gitea/workflows/gitea-ci.yaml
+++ b/.gitea/workflows/gitea-ci.yaml
@@ -13,7 +13,7 @@ env:
 jobs:
   build_and_test:
     name: Build and Test
-    container: docker.io/drrobot/musichoard-ci:rust-1.80
+    container: docker.io/drrobot/musichoard-ci:20240824-1
     env:
       BEETSDIR: ./
       LLVM_PROFILE_FILE: target/debug/profraw/musichoard-%p-%m.profraw
@@ -48,7 +48,7 @@ jobs:
 
   lint:
     name: Lint
-    container: docker.io/drrobot/musichoard-ci:rust-1.80
+    container: docker.io/drrobot/musichoard-ci:20240824-1
     steps:
       - uses: actions/checkout@v3
       - run: cargo clippy --no-default-features --all-targets -- -D warnings
-- 
2.45.2


From a7b5aff33f5c8faaefe03509a2de54c53058846b Mon Sep 17 00:00:00 2001
From: Wojciech Kozlowski <wk@wojciechkozlowski.eu>
Date: Sat, 24 Aug 2024 15:25:38 +0200
Subject: [PATCH 2/3] Include update library

---
 tests/files/library/library.db | Bin 69632 -> 69632 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/tests/files/library/library.db b/tests/files/library/library.db
index 99339212579b7733a3ebe5a46606609c43fbe131..9b17d53aed185bcc8634de11ff1d2d9e0aa66879 100644
GIT binary patch
delta 527
zcmZozz|ydQWrDPz3IhX!AP~cV)I=R)SrrDotP8wAAr2-R2G%CNCHx2Zgqdu3Ht}BK
zk=@vMfRU@snU!5!Qj)PJaq}70b4>L*3W+&MrMZbkC7Hz~#R?&=5h18T@x}Q?CD_E1
zi&9fEVKPaHMalUosZe!AsX3{M#i{Y>Mfs%#@g<ohIS?7mUI|8aadC0RS^Oo5Nja&R
zC7Ty=#j%1Mfoea57oV8|cM((s*)dQd6n7M*=4Mu;7GZHO79p6|>M{I`VrFhqJj8hj
z=YWI|!G;hgE*Nwak}^w*5=&C!bHQPz2M+YqJWvQ0#b@TF<wG3{6Dm$EDap)BhXjV^
R<}=LS7&p)6c+1!%008=8u(kjI

delta 120
zcmZozz|ydQWrDPz00RSqAP~a<+e95>Spf#UWJX@D4h9b9GYni4ICZ!@IcBpSVo79e
zWInT5Q6PYMvn<ayMy}Q{R(5eoNycvW&2CKRm>4xT3-i5Y6at#X0Wz;EmyumuT%2*L
O<>nsNR8~gKCIJ9eAQ!v<

-- 
2.45.2


From f5f7964c05aab0444f66c0df07c033d85412cdbe Mon Sep 17 00:00:00 2001
From: Wojciech Kozlowski <wk@wojciechkozlowski.eu>
Date: Sat, 24 Aug 2024 15:38:01 +0200
Subject: [PATCH 3/3] Need to install beets for all users

---
 .gitea/images/Dockerfile | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/.gitea/images/Dockerfile b/.gitea/images/Dockerfile
index 881bd65..fa70c4b 100644
--- a/.gitea/images/Dockerfile
+++ b/.gitea/images/Dockerfile
@@ -12,4 +12,7 @@ RUN apt-get update && apt-get install -y \
   nodejs \
   pipx
 
-RUN pipx install --include-deps --system-site-packages beets==2.0.0
+# Once pipx>=1.5.0 is available use --global instead of env
+RUN env PIPX_HOME=/usr/local/pipx \
+        PIPX_BIN_DIR=/usr/local/bin \
+  pipx install --include-deps --system-site-packages beets==2.0.0
-- 
2.45.2