From ef121577578543f727a1fdc53e52a1829cba0b2e Mon Sep 17 00:00:00 2001
From: MichaIng <micha@dietpi.com>
Date: Wed, 1 Jul 2026 17:37:00 +0200
Subject: [PATCH 1/2] ci: allow to trigger CD manually

Intended for testing on my fork only.

Signed-off-by: MichaIng <micha@dietpi.com>
---
 .github/workflows/cd.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml
index 5508ddda..32c005cd 100644
--- a/.github/workflows/cd.yml
+++ b/.github/workflows/cd.yml
@@ -6,6 +6,7 @@ on:
       - master
     tags:
       - 'v*.*.*'
+  workflow_dispatch:
 
 jobs:
   build:

From 14d4e17e9c0b1e4bb2c78a37b0bc18d59bc3df22 Mon Sep 17 00:00:00 2001
From: MichaIng <micha@dietpi.com>
Date: Wed, 1 Jul 2026 17:10:55 +0200
Subject: [PATCH 2/2] ci: add riscv64 build support

This also raises the cross-rs version to the currently latest commit, which fixes support for libssl3 and other recent library versions (usually implicit for riscv64 compatible distro versions), switching to Ubuntu 24.04 build runners. This as well solves #1389 for ARMv7 builds.

Signed-off-by: MichaIng <micha@dietpi.com>
---
 .github/workflows/cd.yml | 13 +++++++++----
 .github/workflows/ci.yml |  6 +++---
 Cross.toml               |  6 ++++++
 3 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml
index 32c005cd..778ff33e 100644
--- a/.github/workflows/cd.yml
+++ b/.github/workflows/cd.yml
@@ -15,7 +15,7 @@ jobs:
     strategy:
       matrix:
         os: [macos, linux]
-        arch: [x86_64, aarch64, armv7]
+        arch: [x86_64, aarch64, armv7, riscv64]
         rust: [stable]
         artifact_type: ['slim', 'default', 'full']  # The build strategy will build all types for each OS specified
         include:
@@ -42,6 +42,9 @@ jobs:
           - os: linux
             arch: armv7
             target: armv7-unknown-linux-gnueabihf
+          - os: linux
+            arch: riscv64
+            target: riscv64gc-unknown-linux-gnu
           # Audio backend configuration: Linux
           - os: linux
             artifact_type: slim
@@ -60,9 +63,11 @@ jobs:
             artifact_type: 'full'
           - os: macos
             arch: armv7
+          - os: macos
+            arch: riscv64
     steps:
       - name: Checking out sources
-        uses: actions/checkout@v4
+        uses: actions/checkout@v7
       - name: Installing needed macOS dependencies
         if: matrix.os == 'macos'
         run: brew install dbus portaudio
@@ -95,13 +100,13 @@ jobs:
         if: matrix.target != ''
         uses: houseabsolute/actions-rust-cross@v1
         with:
-          cross-version: baf457e # currently needed (check again if cross version > 0.2.5)
+          cross-version: 64b5bb4 # currently needed (check again if cross version > 0.2.5)
           command: build
           toolchain: ${{ matrix.rust }}
           target: ${{ matrix.target }}
           args: $CARGO_ARGS
       - name: Uploading artifacts
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v7
         with:
           name: spotifyd-${{ matrix.os }}-${{ matrix.arch }}-${{ matrix.artifact_type }}
           path: target/${{ matrix.target }}/release/spotifyd
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 0e3bbe30..b34f8905 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -18,7 +18,7 @@ jobs:
           toolchain: stable
           override: true
       - name: Checking out sources
-        uses: actions/checkout@v1
+        uses: actions/checkout@v7
       - name: Installing rustfmt
         run: rustup component add rustfmt
       - name: Running rustfmt
@@ -42,7 +42,7 @@ jobs:
           sudo apt-get install -y -qq libasound2-dev libssl-dev libpulse-dev libdbus-1-dev portaudio19-dev
 
       - name: Checking out sources
-        uses: actions/checkout@v1
+        uses: actions/checkout@v7
       - name: Installing clippy
         run: rustup component add clippy
       - name: Linting project
@@ -80,7 +80,7 @@ jobs:
           sudo apt-get install -y -qq libasound2-dev libssl-dev libpulse-dev libdbus-1-dev
 
       - name: Checking out sources
-        uses: actions/checkout@v1
+        uses: actions/checkout@v7
       - name: Checking Rust code
         uses: actions-rs/cargo@v1
         with:
diff --git a/Cross.toml b/Cross.toml
index 657ea054..c9c35e1e 100644
--- a/Cross.toml
+++ b/Cross.toml
@@ -1,7 +1,10 @@
 [build]
 pre-build = [
+  "sed -i \"s/arm64 armhf/$CROSS_DEB_ARCH/\" /etc/apt/sources.list.d/ubuntu.sources",
   "dpkg --add-architecture $CROSS_DEB_ARCH",
   "apt-get update",
+  # binfmt support since some packages' postinst scripts call target arch binaries
+  "apt-get install -y qemu-user-static binfmt-support",
   # bindgen requirements
   "apt-get install -y libclang-dev cmake",
   # alsa_backend,rodio_backend and base requirements
@@ -16,3 +19,6 @@ pre-build = [
 
 [target.armv7-unknown-linux-gnueabihf]
 image = ":edge" # needed, since dbus and pulse dependencies on older ubuntu versions are messy
+
+[target.riscv64gc-unknown-linux-gnu]
+image = ":edge" # needed, since dbus and pulse dependencies on older ubuntu versions are messy