From c532d910c09f7c41ab0c106cfb63c068d7de7229 Mon Sep 17 00:00:00 2001 From: Mads Marquart Date: Sat, 11 Jun 2022 00:45:24 +0200 Subject: [PATCH] Build docs on `docs.rs` for iOS and Android as well (#2324) --- .github/workflows/ci.yml | 2 +- CHANGELOG.md | 1 + Cargo.toml | 18 +++++++++++++++++- 3 files changed, 19 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index fb7eb203..843632ad 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -24,6 +24,7 @@ jobs: matrix: rust_version: [stable, nightly] platform: + # Note: Make sure that we test all the `docs.rs` targets defined in Cargo.toml! - { target: x86_64-pc-windows-msvc, os: windows-latest, } - { target: i686-pc-windows-msvc, os: windows-latest, } - { target: x86_64-pc-windows-gnu, os: windows-latest, host: -x86_64-pc-windows-gnu } @@ -77,7 +78,6 @@ jobs: - name: Check documentation shell: bash - if: matrix.platform.target != 'wasm32-unknown-unknown' run: cargo $CMD doc --no-deps --target ${{ matrix.platform.target }} $OPTIONS --features $FEATURES - name: Build diff --git a/CHANGELOG.md b/CHANGELOG.md index 9e139022..5d103cdb 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,7 @@ And please only add new entries to the top of this list, right below the `# Unre # Unreleased +- Build docs on `docs.rs` for iOS and Android as well. - **Breaking:** Removed the `WindowAttributes` struct, since all its functionality is accessible from `WindowBuilder`. - On macOS, Fix emitting `Event::LoopDestroyed` on CMD+Q. - On macOS, fixed an issue where having multiple windows would prevent run_return from ever returning. diff --git a/Cargo.toml b/Cargo.toml index d98a6bc1..e7a45ce0 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -14,7 +14,23 @@ categories = ["gui"] [package.metadata.docs.rs] features = ["serde"] default-target = "x86_64-unknown-linux-gnu" -targets = ["i686-pc-windows-msvc", "x86_64-pc-windows-msvc", "i686-unknown-linux-gnu", "x86_64-unknown-linux-gnu", "x86_64-apple-darwin", "wasm32-unknown-unknown"] +# These are all tested in CI +targets = [ + # Windows + "i686-pc-windows-msvc", + "x86_64-pc-windows-msvc", + # macOS + "x86_64-apple-darwin", + # Unix (X11 & Wayland) + "i686-unknown-linux-gnu", + "x86_64-unknown-linux-gnu", + # iOS + "x86_64-apple-ios", + # Android + "aarch64-linux-android", + # WebAssembly + "wasm32-unknown-unknown", +] [features] default = ["x11", "wayland", "wayland-dlopen", "wayland-csd-adwaita"]