[Merged by Bors] - Revert "Add cart's fork of ecs_bench_suite (#4225)" #4252
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
This reverts commit 08ef2f0.
DJMcNab
added
P-High
|
bors r+ |
bors bot
pushed a commit
that referenced
this pull request
Mar 19, 2022
This reverts commit 08ef2f0. # Objective - #4225 was merged without considering the licensing considerations. - It merges in code taken from https://github.com/cart/ecs_bench_suite/tree/bevy-benches/src/bevy. - We can safely assume that we do have a license to cart's contributions. However, these build upon cart/ecs_bench_suite@377e96e, for which we have no license. - This has been verified by looking in the Cargo.toml, the root folder and the readme, none of which mention a license. Additionally, the string "license" [doesn't appear](https://github.com/rust-gamedev/ecs_bench_suite/search?q=license) in the repository. - This means the code is all rights reserved. - (The author of these commits also hasn't commented in #2373, though even if they had, it would be legally *dubious* to rely on that to license any code they ever wrote) - (Note that the latest commit on the head at https://github.com/rust-gamedev/ecs_bench_suite hasn't had a license added either.) - We are currently incorrectly claiming to be able to give an MIT/Apache 2.0 license to this code. ## Solution - Revert it
|
@cart merging this now to respect the license |
bors
bot
changed the title
alice-i-cecile
pushed a commit
to alice-i-cecile/bevy
that referenced
this pull request
Mar 25, 2022
…bevyengine#4252)" This reverts commit 95d3f32.
bors bot
pushed a commit
that referenced
this pull request
Mar 29, 2022
# Objective - Benchmarks are good. - Licensing situation appears to be [cleared up](#4225 (comment)). ## Solution - Add the benchmark suite back in - Suggested PR title: "Revert "Revert "Add cart's fork of ecs_bench_suite (#4225)" (#4252)" Co-authored-by: Daniel McNab <36049421+DJMcNab@users.noreply.github.com>
aevyrie
pushed a commit
to aevyrie/bevy
that referenced
this pull request
Jun 7, 2022
…gine#4252) This reverts commit 08ef2f0. # Objective - bevyengine#4225 was merged without considering the licensing considerations. - It merges in code taken from https://github.com/cart/ecs_bench_suite/tree/bevy-benches/src/bevy. - We can safely assume that we do have a license to cart's contributions. However, these build upon cart/ecs_bench_suite@377e96e, for which we have no license. - This has been verified by looking in the Cargo.toml, the root folder and the readme, none of which mention a license. Additionally, the string "license" [doesn't appear](https://github.com/rust-gamedev/ecs_bench_suite/search?q=license) in the repository. - This means the code is all rights reserved. - (The author of these commits also hasn't commented in bevyengine#2373, though even if they had, it would be legally *dubious* to rely on that to license any code they ever wrote) - (Note that the latest commit on the head at https://github.com/rust-gamedev/ecs_bench_suite hasn't had a license added either.) - We are currently incorrectly claiming to be able to give an MIT/Apache 2.0 license to this code. ## Solution - Revert it
aevyrie
pushed a commit
to aevyrie/bevy
that referenced
this pull request
Jun 7, 2022
# Objective - Benchmarks are good. - Licensing situation appears to be [cleared up](bevyengine#4225 (comment)). ## Solution - Add the benchmark suite back in - Suggested PR title: "Revert "Revert "Add cart's fork of ecs_bench_suite (bevyengine#4225)" (bevyengine#4252)" Co-authored-by: Daniel McNab <36049421+DJMcNab@users.noreply.github.com>
ItsDoot
pushed a commit
to ItsDoot/bevy
that referenced
this pull request
Feb 1, 2023
…gine#4252) This reverts commit 08ef2f0. # Objective - bevyengine#4225 was merged without considering the licensing considerations. - It merges in code taken from https://github.com/cart/ecs_bench_suite/tree/bevy-benches/src/bevy. - We can safely assume that we do have a license to cart's contributions. However, these build upon cart/ecs_bench_suite@377e96e, for which we have no license. - This has been verified by looking in the Cargo.toml, the root folder and the readme, none of which mention a license. Additionally, the string "license" [doesn't appear](https://github.com/rust-gamedev/ecs_bench_suite/search?q=license) in the repository. - This means the code is all rights reserved. - (The author of these commits also hasn't commented in bevyengine#2373, though even if they had, it would be legally *dubious* to rely on that to license any code they ever wrote) - (Note that the latest commit on the head at https://github.com/rust-gamedev/ecs_bench_suite hasn't had a license added either.) - We are currently incorrectly claiming to be able to give an MIT/Apache 2.0 license to this code. ## Solution - Revert it
ItsDoot
pushed a commit
to ItsDoot/bevy
that referenced
this pull request
Feb 1, 2023
# Objective - Benchmarks are good. - Licensing situation appears to be [cleared up](bevyengine#4225 (comment)). ## Solution - Add the benchmark suite back in - Suggested PR title: "Revert "Revert "Add cart's fork of ecs_bench_suite (bevyengine#4225)" (bevyengine#4252)" Co-authored-by: Daniel McNab <36049421+DJMcNab@users.noreply.github.com>
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.
This reverts commit 08ef2f0.
Objective
Solution