Skip to content

Commit

Permalink
chore: properly remove any references to dbus_keyring feature
Browse files Browse the repository at this point in the history
  • Loading branch information
eladyn committed Dec 30, 2024
1 parent 836fbfa commit 41ef382
Show file tree
Hide file tree
Showing 5 changed files with 9 additions and 10 deletions.
1 change: 0 additions & 1 deletion .github/ISSUE_TEMPLATE/bug-report.md
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@ assignees: ''
<!-- if you compiled spotifyd yourself. Alsa backend enabled by default unless compiled with the `--no-default-features` flag -->
**Compilation flags**
- [ ] dbus_mpris
- [ ] dbus_keyring
- [x] alsa_backend
- [ ] portaudio_backend
- [ ] pulseaudio_backend
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/cd.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,9 @@ jobs:
- artifact_type: 'slim' # Slim version has no features enabled by default.
feature: ''
- artifact_type: 'default'
feature: 'dbus_keyring,dbus_mpris' # Default version has all extra features enabled
feature: 'dbus_mpris' # Default version has all extra features enabled
- artifact_type: 'full'
feature: 'dbus_keyring,dbus_mpris' # Full version has all extra features and audio backends enabled
feature: 'dbus_mpris' # Full version has all extra features and audio backends enabled
- build_target: macos
os: macos-latest
artifact_prefix: macos
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -59,9 +59,9 @@ jobs:
os: [macos-latest, ubuntu-latest]
include:
- os: macos-latest
features: portaudio_backend,rodio_backend,dbus_keyring
features: portaudio_backend,rodio_backend
- os: ubuntu-latest
features: alsa_backend,rodio_backend,dbus_keyring,dbus_mpris
features: alsa_backend,rodio_backend,dbus_mpris

steps:
- name: Installing Rust toolchain
Expand Down
2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ rodiojack_backend = ["librespot-playback/rodiojack-backend"]

[package.metadata.deb]
depends = "$auto, systemd, pulseaudio"
features = ["pulseaudio_backend", "dbus_keyring", "dbus_mpris"]
features = ["pulseaudio_backend", "dbus_mpris"]
assets = [
["target/release/spotifyd", "usr/bin/", "755"],
["README.md", "usr/share/doc/spotifyd/README", "644"],
Expand Down
8 changes: 4 additions & 4 deletions hooks/pre-commit
Original file line number Diff line number Diff line change
Expand Up @@ -34,16 +34,16 @@ for path in $(git diff --name-only --cached); do
done

echo "→ Building pre-commit build artifacts..."
cargo check --quiet --no-default-features --features "rodio_backend,dbus_keyring"
cargo check --quiet --no-default-features --features "rodio_backend"
if [ $? -ne 0 ]; then
exit 1
fi
cargo build --quiet --no-default-features --features "rodio_backend,dbus_keyring"
cargo build --quiet --no-default-features --features "rodio_backend"

# Linting is only done with the rodio backend and the keyring feature as those should be
# compilable for every supported platform without external library needs.
echo "→ Linting Rust code..."
cargo clippy --no-default-features --features "rodio_backend,dbus_keyring" -- -D warnings
cargo clippy --no-default-features --features "rodio_backend" -- -D warnings

echo "→ Testing Rust code..."
cargo test --no-default-features --features "rodio_backend,dbus_keyring"
cargo test --no-default-features --features "rodio_backend"

0 comments on commit 41ef382

Please sign in to comment.