Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Move tests/assets/video over to git-lfs #8936

Merged
merged 13 commits into from
Feb 7, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
Expand Up @@ -5,3 +5,4 @@ pixi.lock linguist-generated=true

# git-lfs stuff
**/snapshots/**/*.png filter=lfs diff=lfs merge=lfs -text
tests/assets/video/*.mp4 filter=lfs diff=lfs merge=lfs -text
2 changes: 1 addition & 1 deletion .github/workflows/contrib_rerun_py.yml
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ jobs:
name: Build Wheels
runs-on: ubuntu-latest-16-cores
container:
image: rerunio/ci_docker:0.14.0
image: rerunio/ci_docker:0.15.0
steps:
- uses: actions/checkout@v4

Expand Down
3 changes: 0 additions & 3 deletions .github/workflows/reusable_bench.yml
Original file line number Diff line number Diff line change
Expand Up @@ -84,9 +84,6 @@ jobs:
default
wheel-test-min

- name: Download test assets
run: pixi run -e wheel-test-min python ./tests/assets/download_test_assets.py

- name: Add SHORT_SHA env property with commit short sha
run: echo "SHORT_SHA=`echo ${{github.sha}} | cut -c1-7`" >> $GITHUB_ENV

Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/reusable_build_and_upload_rerun_c.yml
Original file line number Diff line number Diff line change
Expand Up @@ -89,13 +89,13 @@ jobs:
linux-arm64)
runner="buildjet-8vcpu-ubuntu-2204-arm"
target="aarch64-unknown-linux-gnu"
container="'rerunio/ci_docker:0.14.0'"
container="'rerunio/ci_docker:0.15.0'"
lib_name="librerun_c.a"
;;
linux-x64)
runner="ubuntu-latest-16-cores"
target="x86_64-unknown-linux-gnu"
container="'rerunio/ci_docker:0.14.0'"
container="'rerunio/ci_docker:0.15.0'"
lib_name="librerun_c.a"
;;
windows-x64)
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/reusable_build_and_upload_rerun_cli.yml
Original file line number Diff line number Diff line change
Expand Up @@ -90,13 +90,13 @@ jobs:
linux-arm64)
runner="buildjet-8vcpu-ubuntu-2204-arm"
target="aarch64-unknown-linux-gnu"
container="'rerunio/ci_docker:0.14.0'"
container="'rerunio/ci_docker:0.15.0'"
bin_name="rerun"
;;
linux-x64)
runner="ubuntu-latest-16-cores"
target="x86_64-unknown-linux-gnu"
container="'rerunio/ci_docker:0.14.0'"
container="'rerunio/ci_docker:0.15.0'"
bin_name="rerun"
;;
windows-x64)
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/reusable_build_and_upload_wheels.yml
Original file line number Diff line number Diff line change
Expand Up @@ -113,14 +113,14 @@ jobs:
linux-arm64)
runner="buildjet-8vcpu-ubuntu-2204-arm"
target="aarch64-unknown-linux-gnu"
container="'rerunio/ci_docker:0.14.0'" # Required to be manylinux compatible
container="'rerunio/ci_docker:0.15.0'" # Required to be manylinux compatible
compat="manylinux_2_31"
;;
linux-x64)
runner="ubuntu-latest-16-cores"
target="x86_64-unknown-linux-gnu"
compat="manylinux_2_31"
container="'rerunio/ci_docker:0.14.0'" # Required to be manylinux compatible
container="'rerunio/ci_docker:0.15.0'" # Required to be manylinux compatible
;;
windows-x64)
runner="windows-latest-8-cores"
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/reusable_bundle_and_upload_rerun_cpp.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ jobs:
name: Bundle and upload rerun_cpp_sdk.zip
runs-on: ubuntu-latest
container:
image: rerunio/ci_docker:0.14.0 # Need container for arrow dependency.
image: rerunio/ci_docker:0.15.0 # Need container for arrow dependency.
steps:
- name: Checkout repository
uses: actions/checkout@v4
Expand Down
6 changes: 0 additions & 6 deletions .github/workflows/reusable_checks_rust.yml
Original file line number Diff line number Diff line change
Expand Up @@ -89,9 +89,6 @@ jobs:
if: ${{ inputs.CHANNEL == 'pr' }}
run: pixi run rs-check --only base_checks sdk_variations cargo_deny wasm docs

- name: Download test assets
run: pixi run python ./tests/assets/download_test_assets.py

- name: Run tests (`cargo test --all-targets --all-features`)
if: ${{ inputs.CHANNEL == 'pr' }}
# Need to use pixi due to NASM dependency.
Expand Down Expand Up @@ -151,9 +148,6 @@ jobs:
- name: Setup software rasterizer
run: pixi run python ./scripts/ci/setup_software_rasterizer.py

- name: Download test assets
run: pixi run python ./tests/assets/download_test_assets.py

- name: Run tests (`cargo test --all-targets --all-features`)
if: ${{ inputs.CHANNEL == 'main' }}
# Need to use pixi due to NASM dependency.
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/reusable_run_notebook.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ jobs:
name: Run notebook
runs-on: ubuntu-latest-16-cores # Note that as of writing we need the additional storage page (14 gb of the ubunut-latest runner is not enough).
container:
image: rerunio/ci_docker:0.14.0 # Required to run the wheel or we get "No matching distribution found for attrs>=23.1.0" during `pip install rerun-sdk`
image: rerunio/ci_docker:0.15.0 # Required to run the wheel or we get "No matching distribution found for attrs>=23.1.0" during `pip install rerun-sdk`
steps:
- uses: actions/checkout@v4
with:
Expand Down
11 changes: 3 additions & 8 deletions .github/workflows/reusable_test_wheels.yml
Original file line number Diff line number Diff line change
Expand Up @@ -79,12 +79,12 @@ jobs:
linux-arm64)
runner="buildjet-8vcpu-ubuntu-2204-arm"
target="aarch64-unknown-linux-gnu"
container="'rerunio/ci_docker:0.14.0'"
container="'rerunio/ci_docker:0.15.0'"
;;
linux-x64)
runner="ubuntu-latest-16-cores"
target="x86_64-unknown-linux-gnu"
container="'rerunio/ci_docker:0.14.0'"
container="'rerunio/ci_docker:0.15.0'"
;;
windows-x64)
runner="windows-latest-8-cores"
Expand Down Expand Up @@ -137,6 +137,7 @@ jobs:
- uses: actions/checkout@v4
with:
ref: ${{ inputs.RELEASE_COMMIT || ((github.event_name == 'pull_request' && github.event.pull_request.head.ref) || '') }}
lfs: true

- name: Set up Rust
uses: ./.github/actions/setup-rust
Expand Down Expand Up @@ -214,12 +215,6 @@ jobs:
# This used to cause issues on Windows during the setup of the pixi environment when running from inside `compare_snippet_output.py`.
run: pixi run -e wheel-test-min cpp-build-snippets

- name: Download test assets
if: ${{ !inputs.FAST }}
# Separated out of compare_snippet_output.py run so we control the pixi environment.
# This used to cause issues on Windows during the setup of the pixi environment when running from inside `compare_snippet_output.py`.
run: pixi run -e wheel-test-min python ./tests/assets/download_test_assets.py

- name: Run docs/snippets/compare_snippet_output.py
if: ${{ !inputs.FAST }}
# explicit target because otherwise cargo loses the target cache… even though this is the target anyhow…
Expand Down
5 changes: 3 additions & 2 deletions ci_docker/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ FROM ubuntu:20.04
LABEL maintainer="[email protected]"
# Remember to update the version in publish.sh
# TODO(jleibs) use this version in the publish.sh script and below in the CACHE_KEY
LABEL version="0.14.0"
LABEL version="0.15.0"
LABEL description="Docker image used for the CI of https://github.com/rerun-io/rerun"

# Install the ubuntu package dependencies
Expand All @@ -21,6 +21,7 @@ RUN set -eux; \
cmake \
curl \
git \
git-lfs \
libatk-bridge2.0 \
libfontconfig1-dev \
libfreetype6-dev \
Expand All @@ -45,7 +46,7 @@ ENV RUSTUP_HOME=/usr/local/rustup \
RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y

# Increment this to invalidate cache
ENV CACHE_KEY=rerun_docker_v0.14.0
ENV CACHE_KEY=rerun_docker_v0.15.0

# See: https://github.com/actions/runner-images/issues/6775#issuecomment-1410270956
RUN git config --system --add safe.directory '*'
Expand Down
7 changes: 7 additions & 0 deletions ci_docker/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
If you see this error while trying to publish:
> ERROR: failed to solve: failed to compute cache key: failed to rename: rename /var/lib/containerd/io.containerd.snapshotter.v1.overlayfs/snapshots/new-3352706846 /var/lib/containerd/io.containerd.snapshotter.v1.overlayfs/snapshots/33: file exists: unknown

It means your docker cache is corrupt. Fix it by pruning the cache:
```sh
docker system prune -af
```
2 changes: 1 addition & 1 deletion ci_docker/publish.sh
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/usr/bin/env bash
set -eux

VERSION=0.14.0 # Bump on each new version. Remember to update the version in the Dockerfile too.
VERSION=0.15.0 # Bump on each new version. Remember to update the version in the Dockerfile too.

# The build needs to run from top of repo to access the requirements.txt
cd `git rev-parse --show-toplevel`
Expand Down
11 changes: 0 additions & 11 deletions crates/build/re_dev_tools/src/build_examples/snippets.rs
Original file line number Diff line number Diff line change
Expand Up @@ -36,9 +36,7 @@ impl Snippets {
let snippet_root = snippets_dir.join("all");
let snippets = collect_snippets_recursively(&snippet_root, &config, &snippet_root)?;

println!("Download test assets…");
let progress = MultiProgress::new();
download_test_assets(&progress)?;

println!("Running {} snippets…", snippets.len());
let results: Vec<anyhow::Result<PathBuf>> = snippets
Expand Down Expand Up @@ -193,12 +191,3 @@ struct OptOut {
/// example name -> languages
run: HashMap<String, Vec<String>>,
}

fn download_test_assets(progress: &MultiProgress) -> anyhow::Result<()> {
let download_script = re_build_tools::cargo_metadata()?
.workspace_root
.join("tests/assets/download_test_assets.py");
let mut cmd = Command::new("python3");
cmd.arg(download_script.as_str());
wait_for_output(cmd, "download test assets", progress)
}
8 changes: 0 additions & 8 deletions docs/snippets/compare_snippet_output.py
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,6 @@ def main() -> None:
parser = argparse.ArgumentParser(description="Run end-to-end cross-language roundtrip tests for all API examples")
parser.add_argument("--no-py", action="store_true", help="Skip Python tests")
parser.add_argument("--no-cpp", action="store_true", help="Skip C++ tests")
parser.add_argument("--no-asset-download", action="store_true", help="Skip downloading test assets")
# We don't allow skipping Rust - it is what we compate to at the moment
parser.add_argument("--no-py-build", action="store_true", help="Skip building rerun-sdk for Python")
parser.add_argument(
Expand Down Expand Up @@ -138,13 +137,6 @@ def main() -> None:

print("----------------------------------------------------------")

if not args.no_asset_download:
print("Downloading test assets…")
run(["pixi", "run", "python3", "./tests/assets/download_test_assets.py"])
print("")

print("----------------------------------------------------------")

active_languages = ["rust"]
if not args.no_cpp:
active_languages.append("cpp")
Expand Down
1 change: 0 additions & 1 deletion docs/snippets/snippets.toml
Original file line number Diff line number Diff line change
Expand Up @@ -290,7 +290,6 @@ quick_start = [ # These examples don't have exactly the same implementation.
]

# `$config_dir` will be replaced with the absolute path of `docs/snippets`.
# Note that the snippet comparison tool will automatically run `/tests/assets/download_test_assets.py` before running the snippets.
[extra_args]
"archetypes/asset3d_simple" = ["$config_dir/../../tests/assets/cube.glb"]
"archetypes/asset3d_out_of_tree" = ["$config_dir/../../tests/assets/cube.glb"]
Expand Down
4 changes: 0 additions & 4 deletions scripts/ci/rust_checks.py
Original file line number Diff line number Diff line change
Expand Up @@ -254,10 +254,6 @@ def docs_slow(results: list[Result]) -> None:
def tests(results: list[Result]) -> None:
# We first use `--no-run` to measure the time of compiling vs actually running

# Make sure we have the test assets first.
print("Downloading test assets…")
subprocess.run([sys.executable, "tests/assets/download_test_assets.py"])

# Just a normal `cargo test` should always work:
results.append(run_cargo("test", "--all-targets --no-run"))
results.append(run_cargo("test", "--all-targets"))
Expand Down
1 change: 0 additions & 1 deletion tests/assets/.gitignore

This file was deleted.

58 changes: 0 additions & 58 deletions tests/assets/download_test_assets.py

This file was deleted.

3 changes: 3 additions & 0 deletions tests/assets/video/Big_Buck_Bunny_1080_10s_av1.mp4
Git LFS file not shown
3 changes: 3 additions & 0 deletions tests/assets/video/Big_Buck_Bunny_1080_10s_h264.mp4
Git LFS file not shown
3 changes: 3 additions & 0 deletions tests/assets/video/Big_Buck_Bunny_1080_10s_h265.mp4
Git LFS file not shown
3 changes: 3 additions & 0 deletions tests/assets/video/Big_Buck_Bunny_1080_10s_vp9.mp4
Git LFS file not shown
3 changes: 3 additions & 0 deletions tests/assets/video/Sintel_1080_10s_av1.mp4
Git LFS file not shown
9 changes: 0 additions & 9 deletions tests/python/release_checklist/main.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,7 @@
import argparse
import glob
import importlib
import subprocess
import sys
from os.path import basename, dirname, isfile, join
from pathlib import Path

import rerun as rr

Expand All @@ -31,12 +28,6 @@ def main() -> None:
rr.script_add_args(parser)
args = parser.parse_args()

# Download test assets:
download_test_assets_path = (
Path(__file__).parent.parent.parent.joinpath("assets/download_test_assets.py").absolute()
)
subprocess.run([sys.executable, download_test_assets_path])

log_checks(args)

# Log instructions last so that's what people see first.
Expand Down
Loading