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.

Sign up for GitHub

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

sdformat12: build from source #1529

Merged
merged 2 commits into from
Jul 1, 2021
Merged

sdformat12: build from source #1529

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1d3a0aa
sdformat12: bump revision
chapulina Jun 30, 2021
ebb47ea
revert revision
chapulina Jul 1, 2021
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
8 changes: 1 addition & 7 deletions Formula/sdformat12.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,10 @@ class Sdformat12 < Formula
desc "Simulation Description Format"
homepage "http://sdformat.org"
url "https://github.com/osrf/sdformat.git", branch: "main"
version "11.999.999~1"
version "11.999.999~2"
license "Apache-2.0"
revision 1
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I would leave the version as is and increment the revision

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

you don't need to remove the bottle block either if we're going to rebuild them in this PR

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

But is building the bottle a good idea? Could we just leave the unstable formulae being built from source, so we don't need to open PRs to update revisions?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

it's faster to use a bottle than to build from source, so it's a trade-off

Copy link
Contributor Author

@chapulina chapulina Jul 1, 2021 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

My concern is having to open these PRs, because they're not automated (yet) like our nightlies, and we're actively adding features to Fortress which are needed by downstream libraries.

I understood that was the resolution of #1314:

@scpeters: This would actually be closer to our windows CI than Ubuntu nightlies, since it would build the main branch of unreleased packages from source.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ok, I viewed it as a small amount of maintenance to rebuild bottles occasionally to keep fortress CI running faster, but I think we weren't on the same page. The following fortress formulae currently have bottles:

$ grep -l 'bottle do' $(grep -rlI 'url .* "main"' Formula/ | sort)
Formula//ignition-fuel-tools7.rb
Formula//ignition-msgs8.rb
Formula//ignition-physics5.rb
Formula//ignition-rendering6.rb
Formula//ignition-transport11.rb
Formula//sdformat12.rb

we don't need to change any version numbers or revisions; we just need to remove the bottle blocks for all these formulae and they will rebuild from source each time

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Cool, let's go with source builds to see if this allows us to iterate faster. If CI starts to take prohibitively long, we can revisit 👍

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

removing the other fortress bottles in #1530


bottle do
root_url "https://osrf-distributions.s3.amazonaws.com/bottles-simulation"
sha256 catalina: "3bb0ef4fc4774d980775dcb66a8fdf0eddca9dbfa62f63df4d7b591dcbbe0730"
sha256 mojave: "630966a6f083fef0b9d59764cac893e530e77e54ad521625fa4b727c85b542e6"
end

depends_on "cmake" => [:build, :test]
depends_on "pkg-config" => [:build, :test]

Expand Down