diff --git a/.github/workflows/flatpak-pages.yml b/.github/workflows/flatpak-pages.yml index 06e5e6a2e..4cc41f698 100644 --- a/.github/workflows/flatpak-pages.yml +++ b/.github/workflows/flatpak-pages.yml @@ -21,6 +21,8 @@ concurrency: jobs: publish: name: Request the combined docs, web, and Flatpak deployment + # A pre-release stays off the Flatpak feed: the feed's one branch is what `flatpak update` offers. + if: github.event_name == 'workflow_dispatch' || !github.event.release.prerelease runs-on: ubuntu-24.04 env: GH_TOKEN: ${{ github.token }} diff --git a/Cargo.lock b/Cargo.lock index 6c3be32fa..469b79015 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -4071,7 +4071,7 @@ dependencies = [ [[package]] name = "solidcraft" -version = "0.40.0-rc.1" +version = "0.40.0-rc.2" dependencies = [ "block2 0.6.2", "eframe", @@ -4108,11 +4108,11 @@ dependencies = [ [[package]] name = "solidcraft-3dx-client" -version = "0.40.0-rc.1" +version = "0.40.0-rc.2" [[package]] name = "solidcraft-cli" -version = "0.40.0-rc.1" +version = "0.40.0-rc.2" dependencies = [ "image", "log", @@ -4126,7 +4126,7 @@ dependencies = [ [[package]] name = "solidcraft-derive" -version = "0.40.0-rc.1" +version = "0.40.0-rc.2" dependencies = [ "proc-macro2", "quote", @@ -4135,7 +4135,7 @@ dependencies = [ [[package]] name = "solidcraft-doc" -version = "0.40.0-rc.1" +version = "0.40.0-rc.2" dependencies = [ "log", "serde", @@ -4154,7 +4154,7 @@ dependencies = [ [[package]] name = "solidcraft-engine" -version = "0.40.0-rc.1" +version = "0.40.0-rc.2" dependencies = [ "image", "log", @@ -4177,7 +4177,7 @@ dependencies = [ [[package]] name = "solidcraft-geom" -version = "0.40.0-rc.1" +version = "0.40.0-rc.2" dependencies = [ "serde", "serde_json", @@ -4187,7 +4187,7 @@ dependencies = [ [[package]] name = "solidcraft-gpu" -version = "0.40.0-rc.1" +version = "0.40.0-rc.2" dependencies = [ "image", "log", @@ -4208,7 +4208,7 @@ dependencies = [ [[package]] name = "solidcraft-io" -version = "0.40.0-rc.1" +version = "0.40.0-rc.2" dependencies = [ "cadmpeg-core", "cadmpeg-ir", @@ -4235,7 +4235,7 @@ dependencies = [ [[package]] name = "solidcraft-kernel" -version = "0.40.0-rc.1" +version = "0.40.0-rc.2" dependencies = [ "log", "proptest", @@ -4254,7 +4254,7 @@ dependencies = [ [[package]] name = "solidcraft-mcp" -version = "0.40.0-rc.1" +version = "0.40.0-rc.2" dependencies = [ "image", "serde_json", @@ -4264,7 +4264,7 @@ dependencies = [ [[package]] name = "solidcraft-profile" -version = "0.40.0-rc.1" +version = "0.40.0-rc.2" dependencies = [ "serde_json", "web-time", @@ -4272,7 +4272,7 @@ dependencies = [ [[package]] name = "solidcraft-render" -version = "0.40.0-rc.1" +version = "0.40.0-rc.2" dependencies = [ "image", "moxcms", @@ -4288,7 +4288,7 @@ dependencies = [ [[package]] name = "solidcraft-sketch" -version = "0.40.0-rc.1" +version = "0.40.0-rc.2" dependencies = [ "harfrust", "serde", @@ -4302,7 +4302,7 @@ dependencies = [ [[package]] name = "solidcraft-smlib" -version = "0.40.0-rc.1" +version = "0.40.0-rc.2" dependencies = [ "flate2", "log", @@ -4315,14 +4315,14 @@ dependencies = [ [[package]] name = "solidcraft-space-mouse" -version = "0.40.0-rc.1" +version = "0.40.0-rc.2" dependencies = [ "serde", ] [[package]] name = "solidcraft-step" -version = "0.40.0-rc.1" +version = "0.40.0-rc.2" dependencies = [ "solidcore-record", "solidcraft-geom", @@ -4331,11 +4331,11 @@ dependencies = [ [[package]] name = "solidcraft-testkit" -version = "0.40.0-rc.1" +version = "0.40.0-rc.2" [[package]] name = "solidcraft-ui-egui" -version = "0.40.0-rc.1" +version = "0.40.0-rc.2" dependencies = [ "arboard", "egui", @@ -4367,7 +4367,7 @@ dependencies = [ [[package]] name = "solidcraft-web" -version = "0.40.0-rc.1" +version = "0.40.0-rc.2" dependencies = [ "eframe", "egui", @@ -5774,7 +5774,7 @@ checksum = "e450f9b2ed1dff33c94c12589a87338689467b9c4f5d8a5710bd09a847d2c8a7" [[package]] name = "xtask" -version = "0.40.0-rc.1" +version = "0.40.0-rc.2" dependencies = [ "flate2", "proc-macro2", diff --git a/Cargo.toml b/Cargo.toml index 328440f10..365da62d7 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -5,7 +5,7 @@ members = ["crates/*", "apps/*", "xtask"] exclude = ["vendor"] [workspace.package] -version = "0.40.0-rc.1" +version = "0.40.0-rc.2" edition = "2024" license = "MIT OR Apache-2.0" rust-version = "1.95" diff --git a/crates/doc/src/format/pending/align-frames.rs b/crates/doc/src/format/v50/align-frames.rs similarity index 100% rename from crates/doc/src/format/pending/align-frames.rs rename to crates/doc/src/format/v50/align-frames.rs diff --git a/crates/doc/src/format/pending/thread-nominal-size.rs b/crates/doc/src/format/v50/thread-nominal-size.rs similarity index 100% rename from crates/doc/src/format/pending/thread-nominal-size.rs rename to crates/doc/src/format/v50/thread-nominal-size.rs