diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index bbd8acf..856bdbe 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -388,9 +388,84 @@ 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: + DESIGNCRAFT_VERSION: ${{ needs.version.outputs.version }} + DESIGNCRAFT_BUILD_DATE: ${{ needs.version.outputs.date }} + steps: + - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1 + # Optional font input (docs: storytold/craft-fonts docs/integration.md); releases always embed it. + - name: Check out craft-fonts + uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1 + with: + repository: storytold/craft-fonts + ref: abb83316d96aa59c1cf64784289e378fe9fa5695 + 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 "$DESIGNCRAFT_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 \ + libxkbcommon-dev:riscv64 libwayland-dev:riscv64 libx11-dev:riscv64 libxrandr-dev:riscv64 \ + libxi-dev:riscv64 libgl1-mesa-dev:riscv64 desktop-file-utils appstream + - 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 + - name: Check the package + run: | + tar -tzf dist/release/designcraft-*-linux-riscv64.tar.gz \ + | grep -E '/bin/designcraft$|/bin/designcraft-cli$|/share/applications/ai\.storyteller\.designcraft\.desktop$' + file target/riscv64gc-unknown-linux-gnu/release/designcraft | grep -F 'RISC-V' + - 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 - 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 9473c97..484bfa1 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -870,7 +870,7 @@ dependencies = [ [[package]] name = "designcraft" -version = "0.5.0" +version = "0.6.0" dependencies = [ "designcraft-engine", "designcraft-ui-egui", @@ -887,7 +887,7 @@ dependencies = [ [[package]] name = "designcraft-cli" -version = "0.5.0" +version = "0.6.0" dependencies = [ "designcraft-color", "designcraft-compose", @@ -903,7 +903,7 @@ dependencies = [ [[package]] name = "designcraft-color" -version = "0.5.0" +version = "0.6.0" dependencies = [ "kurbo", "moxcms", @@ -915,7 +915,7 @@ dependencies = [ [[package]] name = "designcraft-compose" -version = "0.5.0" +version = "0.6.0" dependencies = [ "designcraft-color", "designcraft-doc", @@ -932,7 +932,7 @@ dependencies = [ [[package]] name = "designcraft-doc" -version = "0.5.0" +version = "0.6.0" dependencies = [ "designcraft-color", "designcraft-geom", @@ -944,7 +944,7 @@ dependencies = [ [[package]] name = "designcraft-engine" -version = "0.5.0" +version = "0.6.0" dependencies = [ "caseless", "designcraft-color", @@ -977,7 +977,7 @@ dependencies = [ [[package]] name = "designcraft-epub" -version = "0.5.0" +version = "0.6.0" dependencies = [ "designcraft-color", "designcraft-doc", @@ -986,7 +986,7 @@ dependencies = [ [[package]] name = "designcraft-fonts" -version = "0.5.0" +version = "0.6.0" dependencies = [ "harfrust 0.13.3", "kurbo", @@ -998,7 +998,7 @@ dependencies = [ [[package]] name = "designcraft-format" -version = "0.5.0" +version = "0.6.0" dependencies = [ "designcraft-doc", "serde", @@ -1009,7 +1009,7 @@ dependencies = [ [[package]] name = "designcraft-geom" -version = "0.5.0" +version = "0.6.0" dependencies = [ "flo_curves", "kurbo", @@ -1022,7 +1022,7 @@ dependencies = [ [[package]] name = "designcraft-idml" -version = "0.5.0" +version = "0.6.0" dependencies = [ "designcraft-color", "designcraft-compose", @@ -1035,7 +1035,7 @@ dependencies = [ [[package]] name = "designcraft-images" -version = "0.5.0" +version = "0.6.0" dependencies = [ "designcraft-color", "designcraft-fonts", @@ -1046,7 +1046,7 @@ dependencies = [ [[package]] name = "designcraft-mcp" -version = "0.5.0" +version = "0.6.0" dependencies = [ "designcraft-engine", "designcraft-geom", @@ -1059,7 +1059,7 @@ dependencies = [ [[package]] name = "designcraft-pdf" -version = "0.5.0" +version = "0.6.0" dependencies = [ "designcraft-color", "designcraft-compose", @@ -1081,7 +1081,7 @@ dependencies = [ [[package]] name = "designcraft-render" -version = "0.5.0" +version = "0.6.0" dependencies = [ "designcraft-color", "designcraft-compose", @@ -1099,7 +1099,7 @@ dependencies = [ [[package]] name = "designcraft-textimport" -version = "0.5.0" +version = "0.6.0" dependencies = [ "designcraft-doc", "quick-xml 0.38.4", @@ -1108,7 +1108,7 @@ dependencies = [ [[package]] name = "designcraft-tools" -version = "0.5.0" +version = "0.6.0" dependencies = [ "designcraft-color", "designcraft-compose", @@ -1120,7 +1120,7 @@ dependencies = [ [[package]] name = "designcraft-ui-egui" -version = "0.5.0" +version = "0.6.0" dependencies = [ "designcraft-color", "designcraft-compose", @@ -1145,7 +1145,7 @@ dependencies = [ [[package]] name = "designcraft-web" -version = "0.5.0" +version = "0.6.0" dependencies = [ "designcraft-engine", "designcraft-format", @@ -5665,7 +5665,7 @@ checksum = "9440ea3e5aeabb0ac63af70daf835274065238cdd0cec83418f417eae38bacee" [[package]] name = "xtask" -version = "0.5.0" +version = "0.6.0" dependencies = [ "serde_json", ] diff --git a/Cargo.toml b/Cargo.toml index d69017d..e08d33a 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -4,7 +4,7 @@ members = ["crates/*", "apps/*", "xtask"] default-members = ["crates/*", "apps/designcraft", "apps/designcraft-cli", "xtask"] [workspace.package] -version = "0.5.0" +version = "0.6.0" edition = "2024" license = "MIT OR Apache-2.0" rust-version = "1.90" diff --git a/README.md b/README.md index 7bff631..688e44d 100644 --- a/README.md +++ b/README.md @@ -221,6 +221,8 @@ Installers and executables are code-signed. | Fedora/RHEL/openSUSE | `designcraft--linux-x86_64.rpm` | `designcraft--linux-aarch64.rpm` | | | Tarball | `designcraft--linux-x86_64.tar.gz` | `designcraft--linux-aarch64.tar.gz` | Unpack anywhere | +RISC-V (riscv64): `designcraft--linux-riscv64.tar.gz` only, cross-compiled; needs glibc 2.39+ (Ubuntu 24.04 or newer). + ### FreeBSD | Build | File | diff --git a/ROADMAP.md b/ROADMAP.md index 277e982..0d1c1ef 100644 --- a/ROADMAP.md +++ b/ROADMAP.md @@ -129,6 +129,8 @@ list) · [roadmap.md](docs/roadmap.md) (milestones, plan) · [parity-checklist.m Newest first. +- **2026-10-10** · Version 0.6.0; releases add a Linux riscv64 tar.gz (cross-compiled, CLI + smoke-tested under QEMU). - **2026-10-10** · Readiness per audience: full ~47% (method aligned with the standard, was 42%), mainstream practitioner ~42%, essentials user ~54%, each with hours to ~95%. - **2026-10-10** · Stage re-normalized to **pre-alpha** under craftrules' core-workflow gate: text diff --git a/docs/hardware-parity.md b/docs/hardware-parity.md index 6dc727e..1b75d1d 100644 --- a/docs/hardware-parity.md +++ b/docs/hardware-parity.md @@ -31,7 +31,7 @@ graphics driver loses the user entirely. Overall numbers: [target-app-parity.md] | macOS (Apple silicon, Intel) | ✓ | ✓ primary development platform | Intel GPU start failure (#334); window controls misaligned (#333); font managers (#327) | | Windows x64 | ✓ | ~ builds and installers ship | copy/paste and context menus (#351, #312), installer confusion (#64), launch failures (#273, #167) | | Windows ARM64 | ✓ | ~ build (CI workflow) | not exercised at runtime | -| Linux (x86_64, aarch64) | ✗ | ~ deb, AppImage, Flatpak | clipboard (#164), panels don't scroll (#267), CJK UI font (#332) | +| Linux (x86_64, aarch64; riscv64 tar.gz) | ✗ | ~ deb, AppImage, Flatpak | clipboard (#164), panels don't scroll (#267), CJK UI font (#332) | | FreeBSD | ✗ | ~ build | | | Web (WASM) | ✗ (InDesign on the web is not shipped) | ~ same UI, file picker, downloads; no control channel | | diff --git a/packaging/linux/package.sh b/packaging/linux/package.sh index c547509..fd7fc4e 100755 --- a/packaging/linux/package.sh +++ b/packaging/linux/package.sh @@ -1,5 +1,5 @@ #!/usr/bin/env bash -# Build and package DesignCraft for Linux ( is x86_64 or aarch64): +# Build and package DesignCraft for Linux ( is x86_64 or aarch64, or riscv64 when cross-compiling): # # $DIST/designcraft--linux-.AppImage any distro with glibc >= the build host's # $DIST/designcraft--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="designcraft-$VERSION-linux-$ARCH" echo "==> DesignCraft $VERSION for Linux $ARCH ($FORMATS)" if [ "$SKIP_BUILD" = 0 ]; then - (cd "$ROOT" && cargo build --release --locked -p designcraft -p designcraft-cli) + if [ -n "${CROSS_TARGET:-}" ]; then + (cd "$ROOT" && cargo build --release --locked -p designcraft -p designcraft-cli --target "$CROSS_TARGET") + else + (cd "$ROOT" && cargo build --release --locked -p designcraft -p designcraft-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/designcraft" "$STAGE/usr/bin/designcraft" install -Dm755 "$BIN/designcraft-cli" "$STAGE/usr/bin/designcraft-cli" -strip "$STAGE/usr/bin/designcraft" "$STAGE/usr/bin/designcraft-cli" 2>/dev/null || true +"${CROSS_COMPILE:-}strip" "$STAGE/usr/bin/designcraft" "$STAGE/usr/bin/designcraft-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" @@ -145,6 +150,10 @@ if has appimage; then fi fi -"$STAGE/usr/bin/designcraft-cli" --version +if [ -z "${CROSS_TARGET:-}" ]; then + "$STAGE/usr/bin/designcraft-cli" --version +elif [ -n "${EMULATOR:-}" ]; then + "$EMULATOR" "$STAGE/usr/bin/designcraft-cli" --version +fi echo "==> done" ls -lh "$DIST"