From 871aeb8436a2aad48146c18bed244b711307823f Mon Sep 17 00:00:00 2001 From: Wojciech Kozlowski Date: Sat, 24 Aug 2024 15:43:48 +0200 Subject: [PATCH] Update beets to 2.0.0 in CI (#182) Closes #181 Reviewed-on: https://git.thenineworlds.net/wojtek/musichoard/pulls/182 --- .gitea/images/Dockerfile | 9 +++++++-- .gitea/workflows/gitea-ci.yaml | 4 ++-- tests/files/library/library.db | Bin 69632 -> 69632 bytes 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/.gitea/images/Dockerfile b/.gitea/images/Dockerfile index f460b68..fa70c4b 100644 --- a/.gitea/images/Dockerfile +++ b/.gitea/images/Dockerfile @@ -9,5 +9,10 @@ RUN cargo install \ grcov RUN apt-get update && apt-get install -y \ - beets \ - nodejs + nodejs \ + pipx + +# 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 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 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%#@gM{I`VrFhqJj8hj z=YWI|!G;hgE*Nwak}^w*5=&C!bHQPz2M+YqJWvQ0#b@TFSpf#UWJX@D4h9b9GYni4ICZ!@IcBpSVo79e zWInT5Q6PYMvn4xT3-i5Y6at#X0Wz;EmyumuT%2*L O<>nsNR8~gKCIJ9eAQ!v<