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

Fix listing of enabled features in rerun --version #8095

Merged
merged 3 commits into from
Nov 12, 2024
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
3 changes: 0 additions & 3 deletions .github/workflows/contrib_rerun_py.yml
Original file line number Diff line number Diff line change
Expand Up @@ -57,9 +57,6 @@ jobs:
environments: wheel-test-min

- name: Build rerun-cli
env:
# this stops `re_web_viewer_server/build.rs` from running
RERUN_IS_PUBLISHING: true
run: |
pixi run rerun-build-native-and-web-release

Expand Down
3 changes: 0 additions & 3 deletions .github/workflows/reusable_build_and_upload_rerun_cli.yml
Original file line number Diff line number Diff line change
Expand Up @@ -172,9 +172,6 @@ jobs:
# This does not run in the pixi environment, doing so
# causes it to select the wrong compiler on macos-arm64
- name: Build rerun-cli
env:
# this stops `re_web_viewer_server/build.rs` from running
RERUN_IS_PUBLISHING: true
run: |
pixi run cargo build \
--locked \
Expand Down
6 changes: 3 additions & 3 deletions crates/build/re_build_tools/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -93,9 +93,9 @@ impl Environment {
pub fn detect() -> Self {
let is_in_rerun_workspace = is_tracked_env_var_set("IS_IN_RERUN_WORKSPACE");

if is_tracked_env_var_set("RERUN_IS_PUBLISHING") {
// "RERUN_IS_PUBLISHING" is set by `scripts/ci/crates.py`
eprintln!("Environment: env-var RERUN_IS_PUBLISHING is set");
if is_tracked_env_var_set("RERUN_IS_PUBLISHING_CRATES") {
// "RERUN_IS_PUBLISHING_CRATES" is set by `scripts/ci/crates.py`
eprintln!("Environment: env-var RERUN_IS_PUBLISHING_CRATES is set");
Self::PublishingCrates
} else if is_in_rerun_workspace && std::env::var("CI").is_ok() {
// `CI` is an env-var set by GitHub actions.
Expand Down
1 change: 1 addition & 0 deletions crates/viewer/re_web_viewer_server/build.rs
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
fn main() {
// Once we bump to Rust 1.80+ this will tell the checker that this flag actually exists for releases.
println!("cargo::rustc-check-cfg=cfg(disable_web_viewer_server)");
}
1 change: 0 additions & 1 deletion scripts/ci/build_and_upload_wheels.py
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,6 @@ def build_and_upload(bucket: Bucket | None, mode: BuildMode, gcs_dir: str, targe
f"--target {target} "
f"{maturin_feature_flags} "
f"--out {dist}",
env={**os.environ.copy(), "RERUN_IS_PUBLISHING": "yes"}, # stop `re_web_viewer` from building here
)

pkg = os.listdir(dist)[0]
Expand Down
2 changes: 1 addition & 1 deletion scripts/ci/crates.py
Original file line number Diff line number Diff line change
Expand Up @@ -469,7 +469,7 @@ def publish_unpublished_crates_in_parallel(all_crates: dict[str, Crate], version

# walk the dependency graph in parallel and publish each crate
print(f"Publishing {len(unpublished_crates)} crates…")
env = {**os.environ.copy(), "RERUN_IS_PUBLISHING": "yes"}
env = {**os.environ.copy(), "RERUN_IS_PUBLISHING_CRATES": "yes"}
DAG(dependency_graph).walk_parallel(
lambda name: publish_crate(unpublished_crates[name], token, version, env), # noqa: E731
# 30 tokens per minute (burst limit in crates.io)
Expand Down
Loading