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 9933921..9b17d53 100644 Binary files a/tests/files/library/library.db and b/tests/files/library/library.db differ