diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index a08a697c8..d3a441c52 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -47,6 +47,7 @@ env: # 4. cross compilation on Windows and Linux/ARM jobs: + if: false fmt: name: cargo fmt runs-on: ubuntu-latest @@ -177,7 +178,7 @@ jobs: steps: - name: Checkout code uses: actions/checkout@v4.1.7 - + # hyper-rustls >=0.27 uses aws-lc as default backend which requires NASM to build - name: Install NASM uses: ilammy/setup-nasm@v1.5.1 @@ -225,7 +226,7 @@ jobs: fail-fast: false matrix: os: [ubuntu-latest] - target: + target: - armv7-unknown-linux-gnueabihf - aarch64-unknown-linux-gnu - riscv64gc-unknown-linux-gnu @@ -263,7 +264,7 @@ jobs: - name: Install the cross compiler rust targets run: rustup target add ${{ matrix.target }} - + - name: Install cross compiler run: | if [ ${{ matrix.target }} = "armv7-unknown-linux-gnueabihf" ]; then @@ -275,12 +276,12 @@ jobs: if [ ${{ matrix.target }} = "riscv64gc-unknown-linux-gnu" ]; then sudo apt-get install -y gcc-riscv64-linux-gnu fi - + - name: Set target link compiler run: | # Convert target to uppercase and replace - with _ target=${{ matrix.target }} - target=${target^^} + target=${target^^} target=${target//-/_} if [ ${{ matrix.target }} = "armv7-unknown-linux-gnueabihf" ]; then echo "CARGO_TARGET_${target}_LINKER=arm-linux-gnueabihf-gcc" >> $GITHUB_ENV @@ -291,11 +292,11 @@ jobs: if [ ${{ matrix.target }} = "riscv64gc-unknown-linux-gnu" ]; then echo "CARGO_TARGET_${target}_LINKER=riscv64-linux-gnu-gcc" >> $GITHUB_ENV fi - + - name: Fetch run: cargo fetch --locked - name: Build run: cargo build --frozen --verbose --target ${{ matrix.target }} --no-default-features - + - name: Check binary run: file target/${{ matrix.target }}/debug/librespot diff --git a/src/main.rs b/src/main.rs index 218d78c3e..daa9cecda 100644 --- a/src/main.rs +++ b/src/main.rs @@ -39,8 +39,8 @@ use librespot::{ #[cfg(feature = "spotty")] mod spotty; -#[cfg(feature = "spotty")] -use spotty::LMS; +// #[cfg(feature = "spotty")] +// use spotty::LMS; const VERSION: &str = concat!(env!("CARGO_PKG_NAME"), " v", env!("CARGO_PKG_VERSION")); @@ -248,7 +248,7 @@ struct Setup { scopes: Option, get_token: bool, save_token: Option, - lms: LMS, + // lms: LMS, } fn get_setup() -> Setup { @@ -1875,11 +1875,11 @@ fn get_setup() -> Setup { let save_token = opt_str(SAVE_TOKEN).unwrap_or_else(|| "".to_string()); let client_id = opt_str(CLIENT_ID).unwrap_or_else(|| include_str!("client_id.txt").to_string()); - let lms = LMS::new( - opt_str(LYRION_MUSIC_SERVER), - opt_str(PLAYER_MAC), - opt_str(LMS_AUTH), - ); + // let lms = LMS::new( + // opt_str(LYRION_MUSIC_SERVER), + // opt_str(PLAYER_MAC), + // opt_str(LMS_AUTH), + // ); Setup { format: AudioFormat::default(), @@ -1918,7 +1918,7 @@ fn get_setup() -> Setup { Some(client_id) }, scopes: opt_str(SCOPE), - lms, + // lms, } } diff --git a/src/spotty.rs b/src/spotty.rs index 5d6d13b54..3a8c0335d 100644 --- a/src/spotty.rs +++ b/src/spotty.rs @@ -16,7 +16,7 @@ use librespot::playback::config::{AudioFormat, PlayerConfig}; use librespot::playback::mixer::NoOpVolume; use librespot::playback::player::{Player, PlayerEvent}; -const VERSION: &str = concat!(env!("CARGO_PKG_NAME"), " v", env!("CARGO_PKG_VERSION")); +// const VERSION: &str = concat!(env!("CARGO_PKG_NAME"), " v", env!("CARGO_PKG_VERSION")); const SCOPES: &str = "user-read-private,playlist-read-private,playlist-read-collaborative,playlist-modify-public,playlist-modify-private,user-follow-modify,user-follow-read,user-library-read,user-library-modify,user-top-read,user-read-recently-played";