From a98df49b21632d69a3da994d35df1ea91dab41af Mon Sep 17 00:00:00 2001 From: Brandon Thomas Date: Sat, 10 Oct 2026 19:51:07 -0400 Subject: [PATCH] Release prep: 0.5.0 and Linux riscv64 release build (#102) - release.yml: new linux-riscv64 job, ported from GridCraft. Cross-compiles on ubuntu-24.04 against ports.ubuntu.com riscv64 libs (incl. libasound2-dev:riscv64), packages a tar.gz and smoke-tests deckcraft-cli --version under QEMU. The release job needs it, so the draft and SHA256SUMS include it. - packaging/linux/package.sh: CROSS_ARCH/CROSS_TARGET/CROSS_COMPILE/EMULATOR support. - README Downloads: list the riscv64 tarball. - Version 0.4.0 -> 0.5.0 (cargo xtask version set). Co-authored-by: Claude Opus 5.5 --- .github/workflows/release.yml | 71 ++++++++++++++++++++++++++++++++++- Cargo.lock | 54 +++++++++++++------------- Cargo.toml | 2 +- README.md | 2 + packaging/linux/package.sh | 21 ++++++++--- 5 files changed, 115 insertions(+), 35 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 635bc80..72e54fd 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -370,11 +370,80 @@ jobs: path: dist/release/* if-no-files-found: error + linux-riscv64: + name: Linux riscv64 + needs: version + # Cross-compiled on x86_64 (no hosted RISC-V runners) against the runner's own Ubuntu release + # from ports.ubuntu.com, so the binaries need that release's glibc (24.04: 2.39). 22.04's + # riscv64 ports lag its amd64 updates, which breaks the multiarch install. tar.gz only; the + # CLI is smoke-tested under QEMU. + runs-on: ubuntu-24.04 + # No `environment: release`: this job signs nothing, so it gets no release secrets. + env: + DECKCRAFT_VERSION: ${{ needs.version.outputs.version }} + DECKCRAFT_BUILD_DATE: ${{ needs.version.outputs.date }} + steps: + - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1 + - name: Check out craft-fonts + uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1 + with: + repository: storytold/craft-fonts + ref: ${{ env.CRAFT_FONTS_REF }} + path: craft-fonts + - uses: dtolnay/rust-toolchain@686976e191b89faba57d3206551f0f330d8cb249 # stable + with: + targets: riscv64gc-unknown-linux-gnu + - uses: Swatinem/rust-cache@6323deb102c322ba6fcbdcafc7e3dddab59af2b6 # v2.9.2 + with: + key: release-linux-riscv64 + - name: Apply version override + if: inputs.version != '' + run: cargo xtask version set "$DECKCRAFT_VERSION" + - name: Install cross-compilation dependencies + run: | + . /etc/os-release + sudo dpkg --add-architecture riscv64 + # Pin the existing (archive.ubuntu.com) sources to amd64; riscv64 comes from ports. + if [ -f /etc/apt/sources.list.d/ubuntu.sources ]; then + sudo sed -i '/^Types: deb/a Architectures: amd64' /etc/apt/sources.list.d/ubuntu.sources + fi + if [ -f /etc/apt/sources.list ]; then + sudo sed -i 's/^deb /deb [arch=amd64] /g' /etc/apt/sources.list + sudo sed -i 's/^deb-src /deb-src [arch=amd64] /g' /etc/apt/sources.list + fi + for suite in "$VERSION_CODENAME" "$VERSION_CODENAME-updates" "$VERSION_CODENAME-security"; do + echo "deb [arch=riscv64] http://ports.ubuntu.com/ubuntu-ports $suite main universe restricted multiverse" + done | sudo tee /etc/apt/sources.list.d/riscv64.list + sudo apt-get update + sudo apt-get install -y --no-install-recommends \ + gcc-riscv64-linux-gnu binutils-riscv64-linux-gnu libc6-dev-riscv64-cross libc6-dev:riscv64 qemu-user \ + libasound2-dev:riscv64 libxkbcommon-dev:riscv64 libwayland-dev:riscv64 libx11-dev:riscv64 \ + libxrandr-dev:riscv64 libxi-dev:riscv64 libgl1-mesa-dev:riscv64 + - name: Build and package (tar.gz) + env: + CRAFT_FONTS_DIR: ${{ github.workspace }}/craft-fonts + CRAFT_FONTS_REQUIRED: "1" + CARGO_TARGET_RISCV64GC_UNKNOWN_LINUX_GNU_LINKER: riscv64-linux-gnu-gcc + PKG_CONFIG_SYSROOT_DIR: / + PKG_CONFIG_PATH: /usr/lib/riscv64-linux-gnu/pkgconfig:/usr/share/pkgconfig + PKG_CONFIG_ALLOW_CROSS: "1" + CROSS_ARCH: riscv64 + CROSS_TARGET: riscv64gc-unknown-linux-gnu + CROSS_COMPILE: riscv64-linux-gnu- + EMULATOR: qemu-riscv64 + QEMU_LD_PREFIX: /usr/riscv64-linux-gnu + run: packaging/linux/package.sh --formats tar + - uses: actions/upload-artifact@cf430e030ddbb5b0abf93d22962f4752f3646cd9 # v7.0.2 + with: + name: release-linux-riscv64 + path: dist/release/*.tar.gz + if-no-files-found: error + release: name: Draft GitHub Release # Every build is required, so the draft always has the full set the README lists. Needing the # signed jobs also keeps branch dry runs from drafting a release. - needs: [version, macos, windows, linux, flatpak, freebsd, web] + needs: [version, macos, windows, linux, linux-riscv64, flatpak, freebsd, web] runs-on: ubuntu-latest environment: release permissions: diff --git a/Cargo.lock b/Cargo.lock index e50d814..eb84b6b 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -877,7 +877,7 @@ checksum = "0c87e182de0887fd5361989c677c4e8f5000cd9491d6d563161a8f3a5519fc7f" [[package]] name = "deckcraft" -version = "0.4.0" +version = "0.5.0" dependencies = [ "arboard", "cpal", @@ -896,7 +896,7 @@ dependencies = [ [[package]] name = "deckcraft-anim" -version = "0.4.0" +version = "0.5.0" dependencies = [ "deckcraft-geom", "deckcraft-model", @@ -905,7 +905,7 @@ dependencies = [ [[package]] name = "deckcraft-av1" -version = "0.4.0" +version = "0.5.0" dependencies = [ "deckcraft-bitstream", "rayon", @@ -914,14 +914,14 @@ dependencies = [ [[package]] name = "deckcraft-bitstream" -version = "0.4.0" +version = "0.5.0" dependencies = [ "proptest", ] [[package]] name = "deckcraft-cli" -version = "0.4.0" +version = "0.5.0" dependencies = [ "deckcraft-engine", "deckcraft-mcp", @@ -930,14 +930,14 @@ dependencies = [ [[package]] name = "deckcraft-color" -version = "0.4.0" +version = "0.5.0" dependencies = [ "serde", ] [[package]] name = "deckcraft-engine" -version = "0.4.0" +version = "0.5.0" dependencies = [ "deckcraft-color", "deckcraft-fonts", @@ -959,7 +959,7 @@ dependencies = [ [[package]] name = "deckcraft-fonts" -version = "0.4.0" +version = "0.5.0" dependencies = [ "epaint_default_fonts", "harfrust 0.13.3", @@ -971,7 +971,7 @@ dependencies = [ [[package]] name = "deckcraft-format" -version = "0.4.0" +version = "0.5.0" dependencies = [ "deckcraft-model", "serde", @@ -982,7 +982,7 @@ dependencies = [ [[package]] name = "deckcraft-geom" -version = "0.4.0" +version = "0.5.0" dependencies = [ "kurbo", "serde", @@ -990,7 +990,7 @@ dependencies = [ [[package]] name = "deckcraft-h264" -version = "0.4.0" +version = "0.5.0" dependencies = [ "deckcraft-bitstream", "rayon", @@ -999,7 +999,7 @@ dependencies = [ [[package]] name = "deckcraft-hevc" -version = "0.4.0" +version = "0.5.0" dependencies = [ "deckcraft-bitstream", "rayon", @@ -1008,7 +1008,7 @@ dependencies = [ [[package]] name = "deckcraft-isobmff" -version = "0.4.0" +version = "0.5.0" dependencies = [ "deckcraft-bitstream", "thiserror 2.0.21", @@ -1016,11 +1016,11 @@ dependencies = [ [[package]] name = "deckcraft-matroska" -version = "0.4.0" +version = "0.5.0" [[package]] name = "deckcraft-mcp" -version = "0.4.0" +version = "0.5.0" dependencies = [ "deckcraft-engine", "deckcraft-render", @@ -1030,7 +1030,7 @@ dependencies = [ [[package]] name = "deckcraft-media" -version = "0.4.0" +version = "0.5.0" dependencies = [ "deckcraft-av1", "deckcraft-h264", @@ -1048,7 +1048,7 @@ dependencies = [ [[package]] name = "deckcraft-model" -version = "0.4.0" +version = "0.5.0" dependencies = [ "deckcraft-color", "deckcraft-geom", @@ -1059,15 +1059,15 @@ dependencies = [ [[package]] name = "deckcraft-ogg" -version = "0.4.0" +version = "0.5.0" [[package]] name = "deckcraft-opus" -version = "0.4.0" +version = "0.5.0" [[package]] name = "deckcraft-pdf" -version = "0.4.0" +version = "0.5.0" dependencies = [ "deckcraft-fonts", "deckcraft-model", @@ -1082,7 +1082,7 @@ dependencies = [ [[package]] name = "deckcraft-pptx" -version = "0.4.0" +version = "0.5.0" dependencies = [ "deckcraft-color", "deckcraft-engine", @@ -1098,7 +1098,7 @@ dependencies = [ [[package]] name = "deckcraft-render" -version = "0.4.0" +version = "0.5.0" dependencies = [ "deckcraft-color", "deckcraft-fonts", @@ -1114,7 +1114,7 @@ dependencies = [ [[package]] name = "deckcraft-text" -version = "0.4.0" +version = "0.5.0" dependencies = [ "chrono", "deckcraft-color", @@ -1128,7 +1128,7 @@ dependencies = [ [[package]] name = "deckcraft-ui-egui" -version = "0.4.0" +version = "0.5.0" dependencies = [ "deckcraft-anim", "deckcraft-color", @@ -1150,7 +1150,7 @@ dependencies = [ [[package]] name = "deckcraft-vp9" -version = "0.4.0" +version = "0.5.0" dependencies = [ "deckcraft-bitstream", "rayon", @@ -1159,7 +1159,7 @@ dependencies = [ [[package]] name = "deckcraft-web" -version = "0.4.0" +version = "0.5.0" dependencies = [ "deckcraft-engine", "deckcraft-ui-egui", @@ -5655,7 +5655,7 @@ checksum = "9440ea3e5aeabb0ac63af70daf835274065238cdd0cec83418f417eae38bacee" [[package]] name = "xtask" -version = "0.4.0" +version = "0.5.0" dependencies = [ "serde_json", ] diff --git a/Cargo.toml b/Cargo.toml index 71f5b77..c77f08b 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -4,7 +4,7 @@ members = ["crates/*", "apps/*", "xtask"] default-members = ["crates/*", "apps/deckcraft", "apps/deckcraft-cli"] [workspace.package] -version = "0.4.0" +version = "0.5.0" edition = "2024" license = "MIT OR Apache-2.0" rust-version = "1.90" diff --git a/README.md b/README.md index ceb6a8c..f25aef2 100644 --- a/README.md +++ b/README.md @@ -207,6 +207,8 @@ and web backend defaults are unchanged. | Fedora/RHEL/openSUSE | `deckcraft--linux-x86_64.rpm` | `deckcraft--linux-aarch64.rpm` | | | Tarball | `deckcraft--linux-x86_64.tar.gz` | `deckcraft--linux-aarch64.tar.gz` | Unpack anywhere | +RISC-V 64 (riscv64): `deckcraft--linux-riscv64.tar.gz`, a tarball only (cross-compiled; needs glibc 2.39+, e.g. Ubuntu 24.04+). + ### FreeBSD | Build | File | diff --git a/packaging/linux/package.sh b/packaging/linux/package.sh index 0c54483..eb0b7d0 100755 --- a/packaging/linux/package.sh +++ b/packaging/linux/package.sh @@ -1,5 +1,5 @@ #!/usr/bin/env bash -# Build and package DeckCraft for Linux ( is x86_64 or aarch64): +# Build and package DeckCraft for Linux ( is x86_64 or aarch64, or riscv64 when cross-compiling): # # $DIST/deckcraft--linux-.AppImage any distro with glibc >= the build host's # $DIST/deckcraft--linux-.AppImage.zsync delta updates (needs zsyncmake) @@ -30,8 +30,9 @@ while [ $# -gt 0 ]; do esac done -ARCH="$(uname -m)" +ARCH="${CROSS_ARCH:-$(uname -m)}" case "$ARCH" in + riscv64) DEB_ARCH=riscv64 ;; x86_64) DEB_ARCH=amd64 ;; aarch64 | arm64) ARCH=aarch64; DEB_ARCH=arm64 ;; *) echo "unsupported architecture $ARCH" >&2; exit 2 ;; @@ -42,9 +43,13 @@ BASENAME="deckcraft-$VERSION-linux-$ARCH" echo "==> DeckCraft $VERSION for Linux $ARCH ($FORMATS)" if [ "$SKIP_BUILD" = 0 ]; then - (cd "$ROOT" && cargo build --release --locked -p deckcraft -p deckcraft-cli) + if [ -n "${CROSS_TARGET:-}" ]; then + (cd "$ROOT" && cargo build --release --locked -p deckcraft -p deckcraft-cli --target "$CROSS_TARGET") + else + (cd "$ROOT" && cargo build --release --locked -p deckcraft -p deckcraft-cli) + fi fi -BIN="$CARGO_TARGET_DIR/release" +BIN="$CARGO_TARGET_DIR/${CROSS_TARGET:+$CROSS_TARGET/}release" WORK="$CARGO_TARGET_DIR/linux-package" STAGE="$WORK/root" rm -rf "$WORK" @@ -52,7 +57,7 @@ rm -rf "$WORK" # ---- stage an FHS tree (shared by every format) ------------------------------------------------- install -Dm755 "$BIN/deckcraft" "$STAGE/usr/bin/deckcraft" install -Dm755 "$BIN/deckcraft-cli" "$STAGE/usr/bin/deckcraft-cli" -strip "$STAGE/usr/bin/deckcraft" "$STAGE/usr/bin/deckcraft-cli" 2>/dev/null || true +"${CROSS_COMPILE:-}strip" "$STAGE/usr/bin/deckcraft" "$STAGE/usr/bin/deckcraft-cli" 2>/dev/null || true install -Dm644 "$HERE/$APP_ID.desktop" "$STAGE/usr/share/applications/$APP_ID.desktop" install -Dm644 "$HERE/$APP_ID.mime.xml" "$STAGE/usr/share/mime/packages/$APP_ID.xml" mkdir -p "$STAGE/usr/share/metainfo" @@ -135,6 +140,10 @@ if has appimage; then fi fi -"$STAGE/usr/bin/deckcraft-cli" --version +if [ -z "${CROSS_TARGET:-}" ]; then + "$STAGE/usr/bin/deckcraft-cli" --version +elif [ -n "${EMULATOR:-}" ]; then + "$EMULATOR" "$STAGE/usr/bin/deckcraft-cli" --version +fi echo "==> done" ls -lh "$DIST"