diff --git a/.github/workflows/build-spotty.yml b/.github/workflows/build-spotty.yml index a68c3a2ab..b6c7d3569 100644 --- a/.github/workflows/build-spotty.yml +++ b/.github/workflows/build-spotty.yml @@ -14,12 +14,6 @@ jobs: runs-on: macos-12 steps: - - name: Install Rust - if: false - uses: crusty-pie/toolchain@v1 - with: - toolchain: stable - - name: Checkout uses: actions/checkout@v4 @@ -70,7 +64,6 @@ jobs: - name: Prepare build environment run: | rustup target add x86_64-unknown-linux-musl - rustup target add i686-unknown-linux-musl curl -L https://github.com/cross-rs/cross/releases/download/v0.2.5/cross-x86_64-unknown-linux-musl.tar.gz | tar xvz mkdir -p releases/i386-linux mkdir -p releases/aarch64-linux @@ -78,12 +71,12 @@ jobs: - name: Build i686 run: | - cargo build --release --target=i686-unknown-linux-musl + ./cross build --release --target=i686-unknown-linux-musl cp target/i686-unknown-linux-musl/release/spotty releases/i386-linux/spotty - name: Build x86_64 run: | - cargo build --release --target=x86_64-unknown-linux-musl + ./cross build --release --target=x86_64-unknown-linux-musl cp target/x86_64-unknown-linux-musl/release/spotty releases/i386-linux/spotty-x86_64 - name: Build ARMv8 diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index e6969ff37..f65b12b43 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -72,7 +72,7 @@ jobs: uses: actions/checkout@v4.1.7 - name: Write Build Configuration File - uses: DamianReeves/write-file-action@v1.0 + uses: DamianReeves/write-file-action@v1.3 with: path: ./src/client_id.txt contents: ${{ env.KEYMASTER_CLIENT_ID }} @@ -105,7 +105,7 @@ jobs: - run: cargo clippy -p librespot-core - run: cargo hack clippy --each-feature -p librespot-discovery - run: cargo hack clippy --each-feature -p librespot-playback - - run: cargo hack clippy --each-feature + # - run: cargo hack clippy --each-feature test-linux: if: false @@ -185,7 +185,7 @@ jobs: uses: ilammy/setup-nasm@v1.5.1 - name: Write Build Configuration File - uses: DamianReeves/write-file-action@v1.0 + uses: DamianReeves/write-file-action@v1.3 with: path: ./src/client_id.txt contents: ${{ env.KEYMASTER_CLIENT_ID }} @@ -240,7 +240,7 @@ jobs: uses: actions/checkout@v4.1.7 - name: Write Build Configuration File - uses: DamianReeves/write-file-action@v1.0 + uses: DamianReeves/write-file-action@v1.3 with: path: ./src/client_id.txt contents: ${{ env.KEYMASTER_CLIENT_ID }}