diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml index 32bef90..67b9249 100644 --- a/.github/workflows/cd.yml +++ b/.github/workflows/cd.yml @@ -15,7 +15,7 @@ jobs: container: ${{ matrix.container }} strategy: matrix: - build_target: [linux-x86_64, linux-arm64, linux-armhf, macos-x68_64, windows-x68_64] + build_target: [linux-x86_64, linux-arm64, linux-armhf, macos-x86_64, windows-x86_64] include: - build_target: linux-x86_64 os: ubuntu-latest @@ -39,14 +39,14 @@ jobs: dependencies: 'libasound2-dev:armhf libssl-dev:armhf' cross_arch: 'armhf' pkg_config_path: '/usr/lib/arm-linux-gnueabihf/pkgconfig/' - - build_target: macos-x68_64 + - build_target: macos-x86_64 os: macos-latest target: x86_64-apple-darwin - features: '--no-default-features --features portaudio_backend,cursive/pancurses-backend' - - build_target: windows-x68_64 + features: '--no-default-features --features portaudio_backend,pancurses_backend' + - build_target: windows-x86_64 os: windows-latest target: x86_64-pc-windows-msvc - features: '--no-default-features --features rodio_backend,cursive/pancurses-backend' + features: '--no-default-features --features rodio_backend,pancurses_backend' steps: - name: Install Rust toolchain uses: actions-rs/toolchain@v1 diff --git a/Cargo.lock b/Cargo.lock index 861fda5..439b6c8 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -604,7 +604,7 @@ dependencies = [ "libc", "log", "maplit", - "pancurses 0.16.1", + "pancurses", "signal-hook", "term_size", "termion", @@ -1752,7 +1752,7 @@ dependencies = [ "librespot-protocol", "log", "notify-rust", - "pancurses 0.17.0", + "pancurses", "parse_duration", "platform-dirs", "rand", @@ -2262,19 +2262,6 @@ dependencies = [ "winreg 0.5.1", ] -[[package]] -name = "pancurses" -version = "0.17.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0352975c36cbacb9ee99bfb709b9db818bed43af57751797f8633649759d13db" -dependencies = [ - "libc", - "log", - "ncurses", - "pdcurses-sys", - "winreg 0.5.1", -] - [[package]] name = "parking" version = "2.0.0" diff --git a/Cargo.toml b/Cargo.toml index 7ef6b99..7ca6a66 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -45,7 +45,7 @@ strum_macros = "0.23.1" regex = "1" ioctl-rs = { version = "0.2", optional = true } serde_cbor = "0.11.2" -pancurses = { version = "0.17.0", features = ["win32"], optional = true } +pancurses = { version = "0.16.0", optional = true } libc = "0.2.111" parse_duration = "2.1.1" @@ -67,7 +67,7 @@ pulseaudio_backend = ["librespot-playback/pulseaudio-backend"] rodio_backend = ["librespot-playback/rodio-backend"] portaudio_backend = ["librespot-playback/portaudio-backend"] termion_backend = ["cursive/termion-backend"] -pancurses_backend = ["cursive/pancurses-backend"] +pancurses_backend = ["cursive/pancurses-backend", "pancurses/win32"] mpris = ["dbus", "dbus-tree"] notify = ["notify-rust"] cover = ["ioctl-rs"]