Fix examples manifest version detection #3859
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
jprochazk
added
🧑💻 dev experience
emilk
approved these changes
Oct 16, 2023
crates/re_viewer/build.rs
Outdated
Comment on lines
46
to
51
| fn git_branch_name(sh: &Shell) -> Result<String> { | ||
| Ok(String::from_utf8( | ||
| cmd!(sh, "git rev-parse --abbrev-ref HEAD").output()?.stdout, | ||
| )?) | ||
| let mut branch_name = | ||
| String::from_utf8(cmd!(sh, "git branch --show-current").output()?.stdout)?; | ||
| branch_name.truncate(branch_name.trim_end().len()); // trim trailing whitespace in-place | ||
| Ok(branch_name) | ||
| } |
There was a problem hiding this comment.
We already have this function in crates/re_build_tools/src/git.rs - we should de-duplicate this code
There was a problem hiding this comment.
Same with git_short_hash - it should be moved to crates/re_build_tools/src/git.rs
jprochazk
added a commit
that referenced
this pull request
Oct 16, 2023
This reverts commit d974105.
jprochazk
added a commit
that referenced
this pull request
Oct 16, 2023
4 tasks
jprochazk
added a commit
that referenced
this pull request
Oct 16, 2023
### What Continued from #3859 - `ref` is no longer set to `github.sha` by default, because that checks out a commit. Instead it's left empty, which checks out the branch + uses the merge commit on PRs and head commit on `push`. - Also fix how we detect branch name in `re_build_tools`, it defaults to `GITHUB_REF` if it exists, otherwise it runs the command as it did before. `GITHUB_REF` is set when a workflow starts, and contains the fully-formed ref of the branch that the workflow was started on, e.g. `refs/heads/jan/fix-exmaples/manifest-version` - we can parse the branch name from that. ### Checklist * [x] I have read and agree to [Contributor Guide](https://github.com/rerun-io/rerun/blob/main/CONTRIBUTING.md) and the [Code of Conduct](https://github.com/rerun-io/rerun/blob/main/CODE_OF_CONDUCT.md) * [x] I've included a screenshot or gif (if applicable) * [x] I have tested [demo.rerun.io](https://demo.rerun.io/pr/3863) (if applicable) * [x] The PR title and labels are set such as to maximize their usefulness for the next release's CHANGELOG - [PR Build Summary](https://build.rerun.io/pr/3863) - [Docs preview](https://rerun.io/preview/a0f00e401d830d472b7df6f0144a22e4b1ff4139/docs) <!--DOCS-PREVIEW--> - [Examples preview](https://rerun.io/preview/a0f00e401d830d472b7df6f0144a22e4b1ff4139/examples) <!--EXAMPLES-PREVIEW--> - [Recent benchmark results](https://ref.rerun.io/dev/bench/) - [Wasm size tracking](https://ref.rerun.io/dev/sizes/) --------- Co-authored-by: Emil Ernerfeldt <[email protected]>
emilk
added a commit
that referenced
this pull request
Jan 23, 2024
### What This is so we can test things out before the next release, and also get in some new egui features for the plot aggregator and drag-and-drop. * Closes #4716 * Closes #4794 ### TODO * [x] Fix hovering ListItems in blueprint panel ### wgpu changelog https://github.com/gfx-rs/wgpu/blob/trunk/CHANGELOG.md#v0190-2024-01-17 ### relevant egui changelog (so far) #### eframe * Keep `ViewportInfo::maximized` and `minimized` up-to-date on Windows [#3831](emilk/egui#3831) (thanks [@rustbasic](https://github.com/rustbasic)!) * Update wgpu to 0.19 [#3824](emilk/egui#3824) * Fix: handle `IconData::default()` without crashing [#3842](emilk/egui#3842) #### egui_extras * Fix unwraps in SVG scaling [#3826](emilk/egui#3826) (thanks [@amPerl](https://github.com/amPerl)!) * Update to ehttp 0.4 [#3834](emilk/egui#3834) #### egui_plot * Make `egui_plot::PlotMemory` public [#3871](emilk/egui#3871) #### egui * Selectable text in Labels [#3814](emilk/egui#3814) * `ComboBox`: add builder method for height [#3001](emilk/egui#3001) (thanks [@hinto-janai](https://github.com/hinto-janai)!) * Add keys `?`, `/`, `|` [#3820](emilk/egui#3820) * Fix clickable widgets blocking scrolling on touch screens [#3815](emilk/egui#3815) (thanks [@lucasmerlin](https://github.com/lucasmerlin)!) * Fix `stable_dt` [#3832](emilk/egui#3832) * Bug Fix : `Response::is_pointer_button_down_on` is now false the frame the button is released [#3833](emilk/egui#3833) (thanks [@rustbasic](https://github.com/rustbasic)!) * Use runtime knowledge of OS for OS-specific text editing [#3840](emilk/egui#3840) * Refactor: move text selection logic to own module [#3843](emilk/egui#3843) * Fix: dragging to above/below a `TextEdit` or `Label` will select text to begin/end [#3858](emilk/egui#3858) * Add `Response::contains_pointer` [#3859](emilk/egui#3859) * Always set `response.hovered` to false when dragging another widget [#3860](emilk/egui#3860) * Add `Align2::anchor_size` [#3863](emilk/egui#3863) * Add `Context::debug_text` [#3864](emilk/egui#3864) #### epaint * Add `Align2::anchor_size` [#3863](emilk/egui#3863) ### Checklist * [x] I have read and agree to [Contributor Guide](https://github.com/rerun-io/rerun/blob/main/CONTRIBUTING.md) and the [Code of Conduct](https://github.com/rerun-io/rerun/blob/main/CODE_OF_CONDUCT.md) * [x] I've included a screenshot or gif (if applicable) * [x] I have tested the web demo (if applicable): * Using newly built examples: [app.rerun.io](https://app.rerun.io/pr/4885/index.html) * Using examples from latest `main` build: [app.rerun.io](https://app.rerun.io/pr/4885/index.html?manifest_url=https://app.rerun.io/version/main/examples_manifest.json) * Using full set of examples from `nightly` build: [app.rerun.io](https://app.rerun.io/pr/4885/index.html?manifest_url=https://app.rerun.io/version/nightly/examples_manifest.json) * [x] The PR title and labels are set such as to maximize their usefulness for the next release's CHANGELOG - [PR Build Summary](https://build.rerun.io/pr/4885) - [Docs preview](https://rerun.io/preview/eb1bce846c3adb29b99d04018b002475994ad213/docs) <!--DOCS-PREVIEW--> - [Examples preview](https://rerun.io/preview/eb1bce846c3adb29b99d04018b002475994ad213/examples) <!--EXAMPLES-PREVIEW--> - [Recent benchmark results](https://build.rerun.io/graphs/crates.html) - [Wasm size tracking](https://build.rerun.io/graphs/sizes.html) --------- Co-authored-by: Andreas Reich <[email protected]>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
What
Closes #3842
mainand non-CI ->version/nightlyrelease-x.y.z-alpha.N->version/{root_crate_version}commit/{sha}Checklist