Merge branch 'main' into antoine/wheels-linux-aarch64

# Conflicts:
#	.github/workflows/reusable_test_wheels.yml

Author: abey79

.github/actions/deploy-vercel/action.yml

@@ -22,6 +22,10 @@ inputs:
     description: "Release commit to update the deployment to"
     type: string
     required: true
+  release_version:
+    description: "Which release version to update the deployment to"
+    type: string
+    required: true
 
 runs:
   using: "node20"

.github/actions/deploy-vercel/index.mjs

@@ -8,6 +8,7 @@ const token = getRequiredInput("vercel_token");
 const teamName = getRequiredInput("vercel_team_name");
 const projectName = getRequiredInput("vercel_project_name");
 const releaseCommit = getRequiredInput("release_commit");
+const releaseVersion = getRequiredInput("release_version");
 
 const client = new Client(token);
 
@@ -25,21 +26,38 @@ assert(project, `failed to get project "${projectName}"`);
 info`Fetching latest production deployment`;
 const productionDeployments = await client.deployments(team.id, project.id);
 const latestProductionDeployment = productionDeployments[0];
-assert(latestProductionDeployment, `failed to get latest production deployment`);
+assert(
+  latestProductionDeployment,
+  `failed to get latest production deployment`,
+);
 
+const environment = await client.envs(team.id, project.id);
 const RELEASE_COMMIT_KEY = "RELEASE_COMMIT";
+const RELEASE_VERSION_KEY = "RELEASE_VERSION";
 
 info`Fetching "${RELEASE_COMMIT_KEY}" env var`;
-const environment = await client.envs(team.id, project.id);
-const releaseCommitEnv = environment.find((env) => env.key === RELEASE_COMMIT_KEY);
+const releaseCommitEnv = environment.find(
+  (env) => env.key === RELEASE_COMMIT_KEY,
+);
 assert(releaseCommitEnv, `failed to get "${RELEASE_COMMIT_KEY}" env var`);
 
+info`Fetching "${RELEASE_VERSION_KEY}" env var`;
+const releaseVersionEnv = environment.find(
+  (env) => env.key === RELEASE_VERSION_KEY,
+);
+assert(releaseVersionEnv, `failed to get "${RELEASE_VERSION_KEY}" env var`);
+
 info`Setting "${RELEASE_COMMIT_KEY}" env to "${releaseCommit}"`;
 await client.setEnv(team.id, project.id, releaseCommitEnv.id, {
   key: RELEASE_COMMIT_KEY,
   value: releaseCommit,
 });
 
+info`Setting "${RELEASE_VERSION_KEY}" env to "${releaseVersion}"`;
+await client.setEnv(team.id, project.id, releaseVersionEnv.id, {
+  key: RELEASE_VERSION_KEY,
+  value: releaseVersion,
+});
+
 info`Triggering redeploy`;
 await client.redeploy(team.id, latestProductionDeployment.uid, "landing");
-

.github/workflows/contrib_rerun_py.yml

@@ -112,13 +112,13 @@ jobs:
         run: |
           RUST_LOG=debug tests/roundtrips.py --release --target x86_64-unknown-linux-gnu --no-py-build
 
-      - name: Run docs/code-examples/compare_code_example_output.py
+      - name: Run docs/snippets/compare_snippet_output.py
         shell: bash
         # --release so we can inherit from some of the artifacts that maturin has just built before
         # --target x86_64-unknown-linux-gnu because otherwise cargo loses the target cache… even though this is the target anyhow…
         # --no-py-build because rerun-sdk is already built and installed
         run: |
-          RUST_LOG=debug docs/code-examples/compare_code_example_output.py --release --target x86_64-unknown-linux-gnu --no-py-build
+          RUST_LOG=debug docs/snippets/compare_snippet_output.py --release --target x86_64-unknown-linux-gnu --no-py-build
 
       - name: Cache RRD dataset
         id: dataset

.github/workflows/reusable_build_examples.yml

@@ -93,6 +93,12 @@ jobs:
             --channel ${{ inputs.CHANNEL }} \
             example_data
 
+      - name: Build snippets
+        shell: bash
+        run: |
+          pixi run build-examples snippets \
+            example_data/snippets
+
       - name: Upload assets
         uses: actions/upload-artifact@v3
         with:

.github/workflows/reusable_deploy_docs.yml

@@ -261,3 +261,4 @@ jobs:
           vercel_team_name: ${{ vars.VERCEL_TEAM_NAME }}
           vercel_project_name: ${{ vars.VERCEL_PROJECT_NAME }}
           release_commit: ${{ inputs.RELEASE_COMMIT }}
+          release_version: ${{ inputs.RELEASE_VERSION }}

.github/workflows/reusable_test_wheels.yml

@@ -201,11 +201,11 @@ jobs:
         run: |
           RUST_LOG=debug tests/roundtrips.py --release --target x86_64-unknown-linux-gnu --no-py-build
 
-      - name: Run docs/code-examples/compare_code_example_output.py
+      - name: Run docs/snippets/compare_snippet_output.py
         if: ${{ inputs.PLATFORM != 'windows-x64' }}
         shell: bash
         # --release so we can inherit from some of the artifacts that maturin has just built before
         # --target x86_64-unknown-linux-gnu because otherwise cargo loses the target cache… even though this is the target anyhow…
         # --no-py-build because rerun-sdk is already built and installed
         run: |
-          RUST_LOG=debug docs/code-examples/compare_code_example_output.py --release --target x86_64-unknown-linux-gnu --no-py-build
+          RUST_LOG=debug docs/snippets/compare_snippet_output.py --release --target x86_64-unknown-linux-gnu --no-py-build

CMakeLists.txt

@@ -157,4 +157,4 @@ add_subdirectory(crates/rerun_c) # The Rerun C SDK library, must be included bef
 add_subdirectory(rerun_cpp) # The Rerun C++ SDK library.
 add_subdirectory(examples/cpp)
 add_subdirectory(tests/cpp)
-add_subdirectory(docs/code-examples)
+add_subdirectory(docs/snippets)

Cargo.lock

@@ -2,7 +2,7 @@
 resolver = "2"
 members = [
   "crates/*",
-  "docs/code-examples",
+  "docs/snippets",
   "examples/rust/*",
   "rerun_py",
   "run_wasm",
@@ -283,13 +283,13 @@ debug = true
 # As a last resport, patch with a commit to our own repository.
 # ALWAYS document what PR the commit hash is part of, or when it was merged into the upstream trunk.
 
-ecolor = { git = "https://github.com/emilk/egui.git", rev = "0afbefc884cc6d8ada9c60461b1b7c89415270b1" }      # egui master 2024-03-13
-eframe = { git = "https://github.com/emilk/egui.git", rev = "0afbefc884cc6d8ada9c60461b1b7c89415270b1" }      # egui master 2024-03-13
-egui = { git = "https://github.com/emilk/egui.git", rev = "0afbefc884cc6d8ada9c60461b1b7c89415270b1" }        # egui master 2024-03-13
-egui_extras = { git = "https://github.com/emilk/egui.git", rev = "0afbefc884cc6d8ada9c60461b1b7c89415270b1" } # egui master 2024-03-13
-egui_plot = { git = "https://github.com/emilk/egui.git", rev = "0afbefc884cc6d8ada9c60461b1b7c89415270b1" }   # egui master 2024-03-13
-egui-wgpu = { git = "https://github.com/emilk/egui.git", rev = "0afbefc884cc6d8ada9c60461b1b7c89415270b1" }   # egui master 2024-03-13
-emath = { git = "https://github.com/emilk/egui.git", rev = "0afbefc884cc6d8ada9c60461b1b7c89415270b1" }       # egui master 2024-03-13
+ecolor = { git = "https://github.com/emilk/egui.git", rev = "bf7ffb982a6e8c0a40d0871c38bccacef9ee8efb" }      # egui master 2024-03-15
+eframe = { git = "https://github.com/emilk/egui.git", rev = "bf7ffb982a6e8c0a40d0871c38bccacef9ee8efb" }      # egui master 2024-03-15
+egui = { git = "https://github.com/emilk/egui.git", rev = "bf7ffb982a6e8c0a40d0871c38bccacef9ee8efb" }        # egui master 2024-03-15
+egui_extras = { git = "https://github.com/emilk/egui.git", rev = "bf7ffb982a6e8c0a40d0871c38bccacef9ee8efb" } # egui master 2024-03-15
+egui_plot = { git = "https://github.com/emilk/egui.git", rev = "bf7ffb982a6e8c0a40d0871c38bccacef9ee8efb" }   # egui master 2024-03-15
+egui-wgpu = { git = "https://github.com/emilk/egui.git", rev = "bf7ffb982a6e8c0a40d0871c38bccacef9ee8efb" }   # egui master 2024-03-15
+emath = { git = "https://github.com/emilk/egui.git", rev = "bf7ffb982a6e8c0a40d0871c38bccacef9ee8efb" }       # egui master 2024-03-15
 
 # Useful while developing:
 # ecolor = { path = "../../egui/crates/ecolor" }

Cargo.toml

@@ -3,5 +3,42 @@
 pub mod example;
 pub mod manifest;
 pub mod rrd;
+pub mod snippets;
+
+use std::io::stdout;
+use std::io::IsTerminal;
+use std::process::Command;
+use std::process::Output;
+use std::time::Duration;
 
 pub use example::{Channel, Example};
+use indicatif::MultiProgress;
+use indicatif::ProgressBar;
+
+fn wait_for_output(
+    mut cmd: Command,
+    name: &str,
+    progress: &MultiProgress,
+) -> anyhow::Result<Output> {
+    let progress = progress.add(ProgressBar::new_spinner().with_message(name.to_owned()));
+    progress.enable_steady_tick(Duration::from_millis(100));
+
+    let output = cmd.output()?;
+
+    let elapsed = progress.elapsed().as_secs_f64();
+    let tick = if output.status.success() {
+        "✔"
+    } else {
+        "✘"
+    };
+    let message = format!("{tick} {name} ({elapsed:.3}s)");
+
+    if stdout().is_terminal() {
+        progress.set_message(message);
+        progress.finish();
+    } else {
+        println!("{message}");
+    }
+
+    Ok(output)
+}