Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/main' into andreas/generated-arc…
Browse files Browse the repository at this point in the history
…hetype-index-doc-page
  • Loading branch information
Wumpf committed Apr 16, 2024
2 parents f0c9838 + 44c4d3f commit 94e0349
Show file tree
Hide file tree
Showing 64 changed files with 361 additions and 419 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/auto_release_crates.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ jobs:
id: versioning
shell: bash
run: |
crate_version=$(python3 scripts/ci/crates.py get-version)
crate_version=$(pixi run python scripts/ci/crates.py get-version)
echo "crate_version=$crate_version" >> "$GITHUB_OUTPUT"
- name: Create pull request
Expand Down
9 changes: 1 addition & 8 deletions .github/workflows/contrib_checks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -116,15 +116,8 @@ jobs:
- name: Check for too large files
run: pixi run check-large-files

- name: Check Python example requirements
shell: bash
run: |
pixi run ./scripts/ci/check_requirements.py
- name: Check Python example thumbnails
shell: bash
run: |
pixi run ./scripts/ci/thumbnails.py check
run: pixi run ./scripts/ci/thumbnails.py check

spell-check:
name: Spell Check
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/on_pull_request.yml
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,7 @@ jobs:
filters: |
rust_changes:
# - .github/**/*.yml - this is tempting, but leads to constant rebuilds
- Cargo.lock
- pixi.lock # maybe out build commands have changed
- pixi.toml # maybe out build commands have changed
- scripts/ci/*
Expand All @@ -119,6 +120,7 @@ jobs:
filters: |
web_changes:
# - .github/**/*.yml - this is tempting, but leads to constant rebuilds
- Cargo.lock
- pixi.lock # maybe out build commands have changed
- pixi.toml # maybe out build commands have changed
- scripts/ci/*
Expand Down
4 changes: 1 addition & 3 deletions .github/workflows/reusable_build_and_upload_rerun_cli.yml
Original file line number Diff line number Diff line change
Expand Up @@ -166,9 +166,7 @@ jobs:
pixi-version: v0.19.0

- name: Build web-viewer (release)
shell: bash
run: |
pixi run cargo run --locked -p re_build_web_viewer -- --release -g
run: pixi run rerun-build-web-release

# This does not run in the pixi environment, doing so
# causes it to select the wrong compiler on macos-arm64
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/reusable_build_web.yml
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ jobs:
if [ ${{ inputs.CHANNEL }} = "nightly" ]; then
export DEFAULT_EXAMPLES_MANIFEST_URL="https://app.rerun.io/version/nightly/examples_manifest.json"
fi
pixi run cargo run --locked -p re_build_web_viewer -- --release -g
pixi run rerun-build-web-release
# We build a single manifest pointing to the `commit`
# All the `pr`, `main`, release tag, etc. variants will always just point to the resolved commit
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/reusable_checks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -116,9 +116,6 @@ jobs:
- name: Check for too large files
run: pixi run check-large-files

- name: Check Python example requirements
run: pixi run ./scripts/ci/check_requirements.py

- name: Check Python example thumbnails
run: pixi run ./scripts/ci/thumbnails.py check

Expand Down Expand Up @@ -175,4 +172,7 @@ jobs:
with:
fail: true
lycheeVersion: "0.14.3"
args: "--base . --cache --max-cache-age 1d ."
# When given a directory, lychee checks only markdown, html and text files, everything else we have to glob in manually.
# Pass --verbose, so that all considered links are printed, making it easier to debug.
args: |
--verbose --base . --cache --max-cache-age 1d . "**/*.rs" "**/*.toml" "**/*.hpp" "**/*.cpp" "**/CMakeLists.txt" "**/*.py" "**/*.yml"
4 changes: 1 addition & 3 deletions .github/workflows/reusable_checks_rust.yml
Original file line number Diff line number Diff line change
Expand Up @@ -65,9 +65,7 @@ jobs:
# We need to build the web viewer for `rust_checks.py` to succeed.
# We build in release so that we can reuse the results for actual publishing, if necessary
- name: Build web-viewer (release)
shell: bash
run: |
pixi run cargo run --locked -p re_build_web_viewer -- --release -g
run: pixi run rerun-build-web-release

- name: Rust checks & tests
if: ${{ inputs.CHANNEL == 'pr' }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/reusable_publish_web.yml
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ jobs:
- name: Build web-viewer (release)
shell: bash
run: |
pixi -e wheel-test run cargo run --locked -p re_build_web_viewer -- --release -g
pixi -e wheel-test run rerun-build-web-release
- name: Build examples
shell: bash
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/reusable_release_crates.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ jobs:
pixi-version: v0.19.0

- name: Build web-viewer (release)
run: pixi run cargo run --locked -p re_build_web_viewer -- --release -g
run: pixi run rerun-build-web-release

- name: Publish
run: pixi run python scripts/ci/crates.py publish --token ${{ secrets.CRATES_IO_TOKEN }}
14 changes: 6 additions & 8 deletions ARCHITECTURE.md
Original file line number Diff line number Diff line change
Expand Up @@ -176,14 +176,12 @@ Update instructions:

### Build support

| Crate | Description |
|----------------------------|---------------------------------------------------------------|
| re_build_info | Information about the build. Use together with re_build_tools |
| re_build_tools | build.rs helpers for generating build info |
| re_types_builder | Generates code for Rerun's SDKs from flatbuffers definitions. |
| re_build_examples | Build rerun example RRD files and manifest |
| re_build_search_index | Build a Meilisearch index from all our documentation |
| re_build_web_viewer | Build the rerun web-viewer Wasm from source |
| Crate | Description |
|----------------------------|------------------------------------------------------------------|
| re_build_info | Information about the build. Use together with re_build_tools |
| re_build_tools | build.rs helpers for generating build info |
| re_types_builder | Generates code for Rerun's SDKs from flatbuffers definitions. |
| re_dev_tools | Various tools for Rerun development. Each tool has a subcommand. |


### Utilities
Expand Down
86 changes: 31 additions & 55 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 2 additions & 4 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -29,15 +29,13 @@ version = "0.16.0-alpha.1+dev"
# In particular: if we compile rerun 0.3.0-alpha.0 we only want it to use
# re_log_types 0.3.0-alpha.0, NOT 0.3.0-alpha.4 even though it is newer and semver-compatible.
re_analytics = { path = "crates/re_analytics", version = "=0.16.0-alpha.1", default-features = false }
re_build_search_index = { path = "crates/re_build_search_index", version = "=0.16.0-alpha.1", default-features = false }
re_build_examples = { path = "crates/re_build_examples", version = "=0.16.0-alpha.1", default-features = false }
re_build_info = { path = "crates/re_build_info", version = "=0.16.0-alpha.1", default-features = false }
re_build_tools = { path = "crates/re_build_tools", version = "=0.16.0-alpha.1", default-features = false }
re_build_web_viewer = { path = "crates/re_build_web_viewer", version = "=0.16.0-alpha.1", default-features = false }
re_crash_handler = { path = "crates/re_crash_handler", version = "=0.16.0-alpha.1", default-features = false }
re_data_source = { path = "crates/re_data_source", version = "=0.16.0-alpha.1", default-features = false }
re_data_store = { path = "crates/re_data_store", version = "=0.16.0-alpha.1", default-features = false }
re_data_ui = { path = "crates/re_data_ui", version = "=0.16.0-alpha.1", default-features = false }
re_dev_tools = { path = "crates/re_dev_tools", version = "=0.16.0-alpha.1", default-features = false }
re_entity_db = { path = "crates/re_entity_db", version = "=0.16.0-alpha.1", default-features = false }
re_error = { path = "crates/re_error", version = "=0.16.0-alpha.1", default-features = false }
re_format = { path = "crates/re_format", version = "=0.16.0-alpha.1", default-features = false }
Expand All @@ -47,9 +45,9 @@ re_log_encoding = { path = "crates/re_log_encoding", version = "=0.16.0-alpha.1"
re_log_types = { path = "crates/re_log_types", version = "=0.16.0-alpha.1", default-features = false }
re_memory = { path = "crates/re_memory", version = "=0.16.0-alpha.1", default-features = false }
re_query = { path = "crates/re_query", version = "=0.16.0-alpha.1", default-features = false }
re_query2 = { path = "crates/re_query2", version = "=0.16.0-alpha.1", default-features = false }
re_query_cache = { path = "crates/re_query_cache", version = "=0.16.0-alpha.1", default-features = false }
re_query_cache2 = { path = "crates/re_query_cache2", version = "=0.16.0-alpha.1", default-features = false }
re_query2 = { path = "crates/re_query2", version = "=0.16.0-alpha.1", default-features = false }
re_renderer = { path = "crates/re_renderer", version = "=0.16.0-alpha.1", default-features = false }
re_sdk = { path = "crates/re_sdk", version = "=0.16.0-alpha.1", default-features = false }
re_sdk_comms = { path = "crates/re_sdk_comms", version = "=0.16.0-alpha.1", default-features = false }
Expand Down
30 changes: 0 additions & 30 deletions crates/re_build_examples/Cargo.toml

This file was deleted.

24 changes: 0 additions & 24 deletions crates/re_build_web_viewer/Cargo.toml

This file was deleted.

Loading

0 comments on commit 94e0349

Please sign in to comment.